diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-01-27 10:27:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-27 10:27:49 -0800 |
| commit | 99e63ef24e18c8ca918922b052de96a8ceca48a4 (patch) | |
| tree | f51f4546f505b9387b0b44f0cfeee1ed27217ad0 /Documentation/git-diff-files.txt | |
| parent | Git 1.7.4-rc3 (diff) | |
| parent | rebase -i: clarify in-editor documentation of "exec" (diff) | |
| download | tgif-99e63ef24e18c8ca918922b052de96a8ceca48a4.tar.xz | |
Merge branch 'maint'
* maint:
rebase -i: clarify in-editor documentation of "exec"
tests: sanitize more git environment variables
fast-import: treat filemodify with empty tree as delete
rebase: give a better error message for bogus branch
rebase: use explicit "--" with checkout
Conflicts:
t/t9300-fast-import.sh
Diffstat (limited to 'Documentation/git-diff-files.txt')
0 files changed, 0 insertions, 0 deletions