Merge branch 'cw/rebase-i-root'

Junio C Hamano committed about 14 years ago

Merge branch 'mh/maint-revisions-doc'

Junio C Hamano committed about 14 years ago

checkout: don't confuse ref and object flags

Jeff King committed about 14 years ago

git-submodule: work with GIT_DIR/GIT_WORK_TREE

Daniel Graña committed over 14 years ago

help.c::exclude_cmds(): plug a leak

Junio C Hamano committed about 14 years ago

help.c::uniq: plug a leak

Jeff King committed about 14 years ago

i18n: rebase: mark messages for translation

Jiang Xin committed about 14 years ago

i18n: New keywords for xgettext extraction from sh

Jiang Xin committed about 14 years ago

difftool: Check all return codes from compare()

David Aguilar committed about 14 years ago

difftool: Handle finding mergetools/ in a path with spaces

David Aguilar committed about 14 years ago

Enumerate revision range specifiers in the documentation

Junio C Hamano committed about 14 years ago

Update draft release notes to 1.7.12

Junio C Hamano committed about 14 years ago

Merge branch 'jc/mergetool-tool-help'

Junio C Hamano committed about 14 years ago

Merge branch 'jk/maint-commit-document-editmsg'

Junio C Hamano committed about 14 years ago

Merge branch 'jk/maint-commit-check-committer-early'

Junio C Hamano committed about 14 years ago

Merge branch 'jk/maint-advise-vaddf'

Junio C Hamano committed about 14 years ago

t/lib-httpd: handle running under --valgrind

Jeff King committed about 14 years ago

rebase -i: handle fixup of root commit correctly

Chris Webb committed about 14 years ago

t1306: check that XDG_CONFIG_HOME works

Jeff King committed about 14 years ago

ignore: make sure we have an xdg path before using it

Matthieu Moy committed about 14 years ago