Merge branch 'ew/svn-test-and-old-i18n'

Junio C Hamano committed over 17 years ago

Merge branch 'mw/send-email'

Junio C Hamano committed over 17 years ago

Merge branch 'cc/bisect' (early part)

Junio C Hamano committed over 17 years ago

git-add: no need for -f when resolving a conflict in already tracked path

Jeff King committed over 17 years ago

config.txt: document add.ignore-errors

Stephen Boyd committed over 17 years ago

bash: remove always true if statement from __git_ps1()

SZEDER Gábor committed over 17 years ago

git-apply(1): Clarify that one can select where to apply the patch

Björn Steinbrink committed over 17 years ago

http-push: reuse existing is_null_ref

Clemens Buchacher committed over 17 years ago

t9139 uses ancient, backwards-compatible iconv names

Eric Wong committed over 17 years ago

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

Junio C Hamano committed over 17 years ago

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

Thomas Rast committed over 17 years ago

man page: add an EXAMPLES section.

Avery Pennarun committed over 17 years ago

Add basic git-subtree manpage in asciidoc format.

Avery Pennarun committed over 17 years ago

Make --squash work with the 'add' command too.

Avery Pennarun committed over 17 years ago

Fix splitting after using a squash merge.

Avery Pennarun committed over 17 years ago

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