diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-13 10:30:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-13 10:30:53 +0200 |
| commit | 5b590d783a461c63fa803d1c21b57bc79c0207f7 (patch) | |
| tree | 3ad36990856314a6956226c0daf182f6df6762d5 /git-merge-octopus.sh | |
| parent | rebase: use plumbing to show dirty state (diff) | |
| parent | GIT 1.6.4.3 (diff) | |
| download | git-5b590d783a461c63fa803d1c21b57bc79c0207f7.tar.xz git-5b590d783a461c63fa803d1c21b57bc79c0207f7.zip | |
Merge branch 'maint'
* maint:
GIT 1.6.4.3
svn: properly escape arguments for authors-prog
http.c: remove verification of remote packs
grep: accept relative paths outside current working directory
grep: fix exit status if external_grep() punts
Conflicts:
GIT-VERSION-GEN
RelNotes
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions