Merge branch 'nd/grep-true-path' into maint

Junio C Hamano committed almost 14 years ago

Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint

Junio C Hamano committed almost 14 years ago

Merge branch 'da/mergetools-p4' into maint

Junio C Hamano committed almost 14 years ago

Merge branch 'jc/test-say-color-avoid-echo-escape' into maint

Junio C Hamano committed almost 14 years ago

Merge branch 'bw/config-lift-variable-name-length-limit' into maint

Junio C Hamano committed almost 14 years ago

submodule: display summary header in bold

Ramkumar Ramachandra committed almost 14 years ago

diff: rename "set" variable

Jeff King committed almost 14 years ago

diff: introduce diff.submodule configuration variable

Ramkumar Ramachandra committed almost 14 years ago

Documentation: move diff.wordRegex from config.txt to diff-config.txt

Ramkumar Ramachandra committed almost 14 years ago

tcsh-completion re-using git-completion.bash

Marc Khouzam committed almost 14 years ago

status: add advice on how to push/pull to tracking branch

Matthieu Moy committed almost 14 years ago

completion: simplify __gitcomp() test helper

Felipe Contreras committed almost 14 years ago

completion: refactor __gitcomp related tests

Felipe Contreras committed almost 14 years ago

completion: consolidate test_completion*() tests

Felipe Contreras committed almost 14 years ago

completion: simplify tests using test_completion_long()

Felipe Contreras committed almost 14 years ago

completion: standardize final space marker in tests

Felipe Contreras committed almost 14 years ago

completion: add comment for test_completion()

Felipe Contreras committed almost 14 years ago

config: don't segfault when given --path with a missing value

Carlos Martín Nieto committed almost 14 years ago

usage.c: detect recursion in die routines and bail out immediately

Brandon Casey committed almost 14 years ago

ident: keep separate "explicit" flags for author and committer

Jeff King committed almost 14 years ago