diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:41:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:41:28 -0700 |
commit | b5e104a0e69f224b89a849fa1e9b4064a36c2f4b (patch) | |
tree | 20452ad8f672fccb4fe71b01e575934061405e85 /Documentation/git-merge-one-file.txt | |
parent | Merge branch 'bw/log-all-ref-updates-doc' into maint (diff) | |
parent | rebase: clarify "restore the original branch" (diff) | |
download | tgif-b5e104a0e69f224b89a849fa1e9b4064a36c2f4b.tar.xz |
Merge branch 'mz/doc-rebase-abort' into maint
* mz/doc-rebase-abort:
rebase: clarify "restore the original branch"
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions