Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ss/pull-rebase-preserve'
author
Junio C Hamano
<gitster@pobox.com>
Sat, 28 Mar 2015 16:37:51 +0000
(09:37 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 28 Mar 2015 16:37:52 +0000
(09:37 -0700)
* ss/pull-rebase-preserve:
docs: clarify "preserve" option wording for git-pull
1
2
Documentation/git-pull.txt
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
cf98c42
129260c
)
diff --cc
Documentation/git-pull.txt
Simple merge