2017年8月29日 星期二

[ Git 常見問題 ] git merge without auto commit

Source From Here 
Question 
Is it possible to do a "git merge", but without a commit? "man git merge" says this: 
With --no-commit perform the merge but pretend the merge failed and do not autocommit, 
to give the user a chance to inspect and further tweak the merge result before 
committing.

But when I try to use git merge with the --no-commit it still auto-commits. Here's what I did: 
#/b] git checkout master 
Switched to branch 'master' 

[b]#
 git branch 
* master 
v1.0
 

# git merge --no-commit v1.0 
Updating c0c9fd2..18fa02c 
Fast-forward 
file1 | 1 + 
1 files changed, 1 insertions(+), 0 deletions(-)
 

# git status 
# On branch master 
# Your branch is ahead of 'origin/master' by 1 commit. 
# 
nothing to commit (working directory clean)

A subsequent "git log" reveals all the commits from the v1.0 branch merged into master. 

How-To 
Note the output while doing the merge - it is saying Fast Forward! In such situations, you want to do: 
# git merge v1.0 --no-commit --no-ff


沒有留言:

張貼留言

[ Python 常見問題 ] Get all object attributes in Python?

Source From  Here   Question   Is there a way to  get all attributes/methods/fields/etc. of an object in Python ?  vars()  is close to what ...