Merge branch 'ma/bash-completion-leaking-x' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jc/push-cert' into maint

Junio C Hamano committed over 11 years ago

Documentation: clarify how "git commit" cleans up the edited log message

Fredrik Gustafsson committed over 11 years ago

t0027: Add repoMIX and LF_nul

Torsten Bögershausen committed over 11 years ago

status: document the -v/--verbose option

Michael Haggerty committed over 11 years ago

RelNotes: wordsmithing

Michael Haggerty committed over 11 years ago

RelNotes: refer to the rebase -i "todo list", not "insn sheet"

Michael Haggerty committed over 11 years ago

RelNotes: correct name of versionsort.prereleaseSuffix

Michael Haggerty committed over 11 years ago

git tag: mention versionsort.prereleaseSuffix in manpage

Michael Haggerty committed over 11 years ago

git-p4: improve client path detection when branches are used

Vitor Antunes committed over 11 years ago

ignore: info/exclude should trump core.excludesfile

Junio C Hamano committed over 11 years ago

Git 2.4.0-rc3

Junio C Hamano committed over 11 years ago

stop putting argv[0] dirname at front of PATH

Jeff King committed over 11 years ago

stash: require a clean index to apply

Jeff King committed over 11 years ago

t3903: avoid applying onto dirty index

Jeff King committed over 11 years ago

t3903: stop hard-coding commit sha1s

Jeff King committed over 11 years ago

t9801: check git-p4's branch detection with client spec enabled

Vitor Antunes committed over 11 years ago

Sync with maint

Junio C Hamano committed over 11 years ago

Git 2.3.6

Junio C Hamano committed over 11 years ago

Merge branch 'jk/colors' into maint

Junio C Hamano committed over 11 years ago