git-am: refactor 'cleaning up and aborting'

Giuseppe Bilotta committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.2' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.1' into maint-1.6.2

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed over 17 years ago

parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse

Uwe Kleine-König committed over 17 years ago

more tests for git rev-parse --parse-opt

Uwe Kleine-König committed over 17 years ago

diff-tree -r -t: include added/removed directories in the output

Nick Edelen committed over 17 years ago

Merge branch 'mh/fix-send-email-threaded'

Junio C Hamano committed over 17 years ago

Merge branch 'rc/http-push'

Junio C Hamano committed over 17 years ago

Merge branch 'cc/bisect' (early part)

Junio C Hamano committed over 17 years ago

Merge branch 'rc/maint-http-local-slot-fix'

Junio C Hamano committed over 17 years ago

Merge branch 'sp/msysgit'

Junio C Hamano committed over 17 years ago

Merge branch 'cb/maint-no-double-merge'

Junio C Hamano committed over 17 years ago

Merge branch 'ph/submodule-rebase' (early part)

Junio C Hamano committed over 17 years ago

Merge branch 'bc/solaris'

Junio C Hamano committed over 17 years ago

Merge branch 'cb/match_refs_internal_tail'

Junio C Hamano committed over 17 years ago

Merge branch 'nw/maint-cvsexportcommit'

Junio C Hamano committed over 17 years ago

Merge branch 'da/araxis-mergetool'

Junio C Hamano committed over 17 years ago

git-rerere.txt: grammatical fixups and cleanups

Stephen Boyd committed over 17 years ago