Филиалы поменялись местами. Как сохранить свои места при сравнении? - PullRequest
0 голосов
/ 19 июня 2020

Я сравниваю ветки

[alias]
    changesfull = log --graph --decorate --pretty=oneline --abbrev-commit --cherry-mark --boundary --left-right
kes@work ~/s $ git changesfull amazon/dash_v3...dash_v3 
> cbf0af1d (HEAD -> dash_v3) Required change to be able navigate drop down list
> 9c134183 (origin/dash_v3) Routes for testing
> 2e6bbdb1 fix some bug
> 76cc783b Read configuration from correct section
| < 042c5d51 (amazon/dash_v3) Rename: Done -> Set Paid
| < d5d939e6 Log additional info about user activation at grafana
| < 5e5835ed $invoices already active. Remove useless code
| < e33544cf Return to the page from where I came
| < 031d9d24 SCHEMA 104: Added Cache_file table
| < 9e7dd2a7 Label changed when ordering additional ip
|/  
o 720ab363 Remove duplicate file

После выборки некоторые коммиты добавляются в amazon/dash_v3 ветку.

kes@work ~/s $ git fetch amazon 
remote: Counting objects: 22, done.
Unpacking objects: 100% (22/22), 2.29 KiB | 195.00 KiB/s, done.
From amazon:/v1/repos/feelsafe
 + 042c5d51...4cc607a9 dash_v3    -> amazon/dash_v3  (forced update)

И следующее сравнение меняет местами ветки

kes@work ~/s $ git changesfull amazon/dash_v3...dash_v3 
< 4cc607a9 (amazon/dash_v3) Create a new user with the firewall turned off
< 46bcc773 Rename: Done -> Set Paid
< 8c81ac55 Log additional info about user activation at grafana
< b734bd93 $invoices already active. Remove useless code
< 5956a555 Return to the page from where I came
< 031d9d24 SCHEMA 104: Added Cache_file table
< 9e7dd2a7 Label changed when ordering additional ip
| > cbf0af1d (HEAD -> dash_v3) Required change to be able navigate drop down list
| > 9c134183 (origin/dash_v3) Routes for testing
| > 2e6bbdb1 fix some bug
| > 76cc783b Read configuration from correct section
|/  
o 720ab363 Remove duplicate file

Как оставить ветки на своих местах?

Я хочу, чтобы это выглядело так:

kes@work ~/s $ git changesfull amazon/dash_v3...dash_v3 
> cbf0af1d (HEAD -> dash_v3) Required change to be able navigate drop down list
> 9c134183 (origin/dash_v3) Routes for testing
> 2e6bbdb1 fix some bug
> 76cc783b Read configuration from correct section
| < 4cc607a9 (amazon/dash_v3) Create a new user with the firewall turned off
| < 46bcc773 Rename: Done -> Set Paid
| < 8c81ac55 Log additional info about user activation at grafana
| < b734bd93 $invoices already active. Remove useless code
| < 5956a555 Return to the page from where I came
| < 031d9d24 SCHEMA 104: Added Cache_file table
| < 9e7dd2a7 Label changed when ordering additional ip
|/  
o 720ab363 Remove duplicate file
Добро пожаловать на сайт PullRequest, где вы можете задавать вопросы и получать ответы от других членов сообщества.
...