Don't squash-merge if the old and new commits are the same.

Avery Pennarun committed over 17 years ago

Basic "subtree merge --squash" support.

Avery Pennarun committed over 17 years ago

merge_msg() is really more like rejoin_msg().

Avery Pennarun committed over 17 years ago

FIXME help for --squash option

Avery Pennarun committed over 17 years ago

slightly rearrange help message for split.

Avery Pennarun committed over 17 years ago

New --branch option to split command.

Avery Pennarun committed over 17 years ago

typo in comment

Avery Pennarun committed over 17 years ago

Merge branch 'sb/maint-1.6.2-opt-filename-fix'

Junio C Hamano committed over 17 years ago

Merge branch 'jc/maint-add-p-coalesce-fix'

Junio C Hamano committed over 17 years ago

Merge branch 'rs/maint-grep-word-regexp-fix'

Junio C Hamano committed over 17 years ago

t9120: don't expect failure with SVN_HTTPD_PORT unset

Stephen Boyd committed over 17 years ago

for-each-ref: Do not lookup objects when they will not be used

Anders Kaseorg committed over 17 years ago

Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall

Brandon Casey committed over 17 years ago

Documentation: teach stash/pop workflow instead of stash/apply

Thomas Rast committed over 17 years ago

git-cvsexportcommit can't commit files which have been removed from CVS

Nick Woolley committed over 17 years ago

git-am foreign patch support: StGIT support

Giuseppe Bilotta committed over 17 years ago

git-am foreign patch support: autodetect some patch formats

Giuseppe Bilotta committed over 17 years ago

git-am foreign patch support: introduce patch_format

Giuseppe Bilotta committed over 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 17 years ago

bisect: display first bad commit without forking a new process

Christian Couder committed over 17 years ago