bash completion: Add '--merge' long option for 'git log'

Lee Marlow committed over 18 years ago

bash completion: Add completion for 'git mergetool'

Lee Marlow committed over 18 years ago

git format-patch documentation: clarify what --cover-letter does

Matt McCutchen committed over 18 years ago

bash completion: 'git apply' should use 'fix' not 'strip'

Eric Raible committed over 18 years ago

revision --simplify-merges: use decoration instead of commit->util field

Junio C Hamano committed over 18 years ago

xdiff-interface: hide the whole "xdiff_emit_state" business from the caller

Junio C Hamano committed over 18 years ago

Update .gitignore to ignore git-help

Gustaf Hendeby committed over 18 years ago

Use strbuf for struct xdiff_emit_state's remainder

Brian Downing committed over 18 years ago

Make xdi_diff_outf interface for running xdiff_outf diffs

Brian Downing committed over 18 years ago

Merge branch 'maint'

Junio C Hamano committed over 18 years ago

t5304-prune: adjust file mtime based on system time rather than file mtime

Brandon Casey committed over 18 years ago

test-parse-options: use appropriate cast in length_callback

Brandon Casey committed over 18 years ago

Fix escaping of glob special characters in pathspecs

Kevin Ballard committed over 18 years ago

rebase -i -p: fix parent rewriting

Thomas Rast committed over 18 years ago

rebase -i -p: handle index and workdir correctly

Thomas Rast committed over 18 years ago

GIT 1.6.0-rc3

Junio C Hamano committed over 18 years ago

Merge branch 'maint'

Junio C Hamano committed over 18 years ago

Do not talk about "diff" in rev-list documentation.

Junio C Hamano committed over 18 years ago

Merge git://git.bogomips.org/git-svn

Junio C Hamano committed over 18 years ago

Documentation: rev-list-options: move --simplify-merges documentation

Thomas Rast committed over 18 years ago