git-am/git-mailsplit: correct synopsis for reading from stdin

Stephan Beyer committed over 18 years ago

Merge branch 'maint' to sync with 1.5.6.3

Junio C Hamano committed over 18 years ago

GIT 1.5.6.3

Junio C Hamano committed over 18 years ago

Merge branch 'ph/parseopt-step-blame'

Junio C Hamano committed over 18 years ago

Merge branch 'am/stash-branch'

Junio C Hamano committed over 18 years ago

Merge branch 'sg/stash-k-i'

Junio C Hamano committed over 18 years ago

Merge branch 'jc/report-tracking'

Junio C Hamano committed over 18 years ago

Merge branch 'js/pick-root'

Junio C Hamano committed over 18 years ago

Merge branch 'ab/bundle'

Junio C Hamano committed over 18 years ago

Merge branch 'tr/add-i-e'

Junio C Hamano committed over 18 years ago

git-gui: MERGE_RR lives in .git/ directly with newer Git versions

Johannes Schindelin committed over 18 years ago

help (Windows): Display HTML in default browser using Windows' shell API

Steffen Prohaska committed over 18 years ago

help.c: Add support for htmldir relative to git_exec_path()

Steffen Prohaska committed over 18 years ago

Move code interpreting path relative to exec-dir to new function system_path()

Steffen Prohaska committed over 18 years ago

Make usage strings dash-less

Stephan Beyer committed over 18 years ago

Add some useful functions for strbuf manipulation.

Lukas Sandström committed over 18 years ago

Make some strbuf_*() struct strbuf arguments const.

Lukas Sandström committed over 18 years ago

reduce_heads(): thinkofix

Sverre Hvammen Johansen committed over 18 years ago

Add a new test for git-merge-resolve

Miklos Vajna committed over 18 years ago

t6021: add a new test for git-merge-resolve

Miklos Vajna committed over 18 years ago