Merge branch 'js/remote-improvements'

Junio C Hamano committed over 17 years ago

Merge branch 'tr/maint-1.6.0-send-email-irt'

Junio C Hamano committed over 17 years ago

Merge branch 'kb/checkout-optim'

Junio C Hamano committed over 17 years ago

grep: prefer builtin over external one when coloring results

Nguyễn Thái Ngọc Duy committed over 17 years ago

config.txt: Describe special 'none' handling in core.gitProxy.

Emil Sit committed over 17 years ago

ls-files: require worktree when --deleted is given

Jeff King committed over 17 years ago

git-branch.txt: document -f correctly

Michael J Gruber committed over 17 years ago

pickaxe: count regex matches only once

René Scharfe committed over 17 years ago

New config push.default to decide default behavior for push

Finn Arne Gangstad committed over 17 years ago

Display warning for default git push with no push.default config

Finn Arne Gangstad committed over 17 years ago

git-send-email.txt: describe --compose better

Stephen Boyd committed over 17 years ago

Tests: use test_cmp instead of diff where possible

Miklos Vajna committed over 17 years ago

Documentation: remove extra quoting/emphasis around literal texts

Chris Johnsen committed over 17 years ago

git-push.txt: describe how to default to pushing only current branch

Chris Johnsen committed over 17 years ago

disable post-checkout test on Cygwin

Alex Riesen committed over 17 years ago

Revert "lstat_cache(): print a warning if doing ping-pong between cache types"

Kjetil Barvik committed over 17 years ago

Documentation: minor grammatical fixes in git-branch.txt.

David J. Mellor committed over 17 years ago

Documentation: minor grammatical fixes in git-blame.txt.

David J. Mellor committed over 17 years ago

Documentation: reword the "Description" section of git-bisect.txt.

David J. Mellor committed over 17 years ago

config: test for --replace-all with one argument and fix documentation.

Carlos Rica committed over 17 years ago