Merge branch 'mg/diff-uiconfig-doc'

Junio C Hamano committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

Remove duplicated "is a"

João Britto committed over 15 years ago

fast-import: fix option parser for no-arg options

Sverre Rabbelier committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix

Junio C Hamano committed over 15 years ago

send-pack: unbreak push over stateless rpc

Jeff King committed over 15 years ago

git-reset.txt: better docs for '--patch'

Valentin Haenel committed over 15 years ago

git-checkout.txt: better docs for '--patch'

Valentin Haenel committed over 15 years ago

git-stash.txt: better docs for '--patch'

Valentin Haenel committed over 15 years ago

git-add.txt: document 'interactive.singlekey'

Valentin Haenel committed over 15 years ago

config.txt: 'interactive.singlekey; is used by...

Valentin Haenel committed over 15 years ago

t3701: fix here document

Junio C Hamano committed over 15 years ago

git-fast-import.txt: --relative-marks takes no parameter

Michael J Gruber committed over 15 years ago

shell: add missing initialization of argv0_path

Dima Sharov committed over 15 years ago

t/annotate-tests: Use echo & cat instead of sed

Brian Gernhardt committed over 15 years ago

grep: Put calls to fixmatch() and regmatch() into patmatch()

Michał Kiedrowicz committed over 15 years ago

contrib/completion: --line-number to git grep

Michał Kiedrowicz committed over 15 years ago

Documentation: Add --line-number to git-grep synopsis

Michał Kiedrowicz committed over 15 years ago

Update draft release notes to 1.7.6

Junio C Hamano committed over 15 years ago