Merge branch 'maint' into ph/checkout

Junio C Hamano committed over 18 years ago

Make non-static functions, that may be static, static

Stephan Beyer committed over 18 years ago

ignore non-existent refs in dwim_log()

Junio C Hamano committed over 18 years ago

git-completion.bash: provide completion for 'show-branch'

Thomas Rast committed over 18 years ago

bash completion: Add long options for 'git rm'

Lee Marlow committed over 18 years ago

svnimport: newer libsvn wants us to ask for the root with "", not "/"

P. Christeas committed over 18 years ago

builtin-commit: Two trivial style-cleanups

Johannes Schindelin committed over 18 years ago

Documentation/git-filter-branch: teach "rm" instead of "update-index --remove"

Petr Baudis committed over 18 years ago

git daemon: avoid waking up too often

Johannes Schindelin committed over 18 years ago

Documentation: clarify diff --cc

Junio C Hamano committed over 18 years ago

am --abort: Add to bash-completion and mention in git-rerere documentation

Stephan Beyer committed over 18 years ago

git-filter-branch.sh: Allow running in bare repositories

Petr Baudis committed over 18 years ago

builtin-branch.c: optimize --merged and --no-merged

Junio C Hamano committed over 18 years ago

builtin-branch.c: remove unused code in append_ref() callback function

Junio C Hamano committed over 18 years ago

stash save: fix parameter handling

Junio C Hamano committed over 18 years ago

git-am: Add colon before the subject that is printed out as being applied

Stephan Beyer committed over 18 years ago

git-checkout: fix command line parsing.

Pierre Habouzit committed over 18 years ago

rebase -i: When an 'edit' stops, mention the commit

Johannes Sixt committed over 18 years ago

sort_in_topological_order(): avoid setting a commit flag

Johannes Schindelin committed over 18 years ago

Add test to show that show-branch misses out the 8th column

Johannes Schindelin committed over 18 years ago