diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:33:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:33:08 -0700 |
commit | 07d6309e63aa272d2930540faa72147dc5be97a5 (patch) | |
tree | 90ac260b170f62b92d4169de01f39dfcbf67460e /Documentation/git-diff-files.txt | |
parent | filter-branch: make the usage string fit on 80 chars terminals. (diff) | |
parent | pull: support rebased upstream + fetch + pull --rebase (diff) | |
download | tgif-07d6309e63aa272d2930540faa72147dc5be97a5.tar.xz |
Merge branch 'sb/maint-pull-rebase' into maint
* sb/maint-pull-rebase:
pull: support rebased upstream + fetch + pull --rebase
t5520-pull: Test for rebased upstream + fetch + pull --rebase
Diffstat (limited to 'Documentation/git-diff-files.txt')
0 files changed, 0 insertions, 0 deletions