summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t0050: use the SYMLINKS test prereqMichael J Gruber2012-07-271-14/+7
* t0050: use the CASE_INSENSITIVE_FS test prereqMichael J Gruber2012-07-271-13/+8
* test-lib: provide case insensitivity as a prerequisiteMichael J Gruber2012-07-273-10/+10
* test: allow prerequisite to be evaluated lazilyJunio C Hamano2012-07-272-3/+46
* test: rename $satisfied to $satisfied_prereqJunio C Hamano2012-07-271-3/+3
* Merge branch 'jc/test-lib-source-build-options-early'Junio C Hamano2012-07-251-23/+22
|\
| * test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlierJunio C Hamano2012-06-241-23/+22
* | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-254-6/+48
|\ \
| * | t1306: check that XDG_CONFIG_HOME worksJeff King2012-07-241-0/+26
| * | ignore: make sure we have an xdg path before using itMatthieu Moy2012-07-242-1/+8
| * | attr: make sure we have an xdg path before using itJeff King2012-07-242-5/+13
| * | test-lib.sh: unset XDG_CONFIG_HOMEJeff King2012-07-241-0/+1
* | | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-252-12/+21
|\ \ \
| * | | rebase -i: handle fixup of root commit correctlyChris Webb2012-07-242-12/+21
* | | | Merge branch 'mh/maint-revisions-doc'Junio C Hamano2012-07-251-6/+37
|\ \ \ \
| * | | | Enumerate revision range specifiers in the documentationJunio C Hamano2012-07-241-0/+31
| * | | | Make <refname> documentation more consistent.Max Horn2012-07-051-6/+6
* | | | | Update draft release notes to 1.7.12Junio C Hamano2012-07-241-2/+19
* | | | | Merge branch 'jc/mergetool-tool-help'Junio C Hamano2012-07-243-5/+49
|\ \ \ \ \
| * | | | | mergetool: support --tool-help option like difftool doesJunio C Hamano2012-07-233-5/+49
* | | | | | Merge branch 'jk/maint-commit-document-editmsg'Junio C Hamano2012-07-241-0/+9
|\ \ \ \ \ \
| * | | | | | commit: document the temporary commit message fileJeff King2012-07-231-0/+9
| |/ / / / /
* | | | | | Merge branch 'jk/maint-commit-check-committer-early'Junio C Hamano2012-07-241-1/+1
|\ \ \ \ \ \
| * | | | | | commit: check committer identity more strictlyJeff King2012-07-231-1/+1
* | | | | | | Merge branch 'jk/maint-advise-vaddf'Junio C Hamano2012-07-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | advice: pass varargs to strbuf_vaddf, not strbuf_addfJeff King2012-07-231-1/+1
| |/ / / / / /
* | | | | | | t/lib-httpd: handle running under --valgrindJeff King2012-07-242-1/+8
* | | | | | | Git 1.7.12-rc0v1.7.12-rc0Junio C Hamano2012-07-232-1/+13
* | | | | | | Merge branch 'jn/block-sha1'Junio C Hamano2012-07-232-7/+6
|\ \ \ \ \ \ \
| * | | | | | | Makefile: BLK_SHA1 does not require fast htonl() and unaligned loadsJonathan Nieder2012-07-231-3/+2
| * | | | | | | block-sha1: put expanded macro parameters in parenthesesJonathan Nieder2012-07-221-2/+2
| * | | | | | | block-sha1: avoid pointer conversion that violates alignment constraintsJonathan Nieder2012-07-221-3/+3
* | | | | | | | Merge branch 'jn/make-assembly-in-right-directory'Junio C Hamano2012-07-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: fix location of listing produced by "make subdir/foo.s"Jonathan Nieder2012-07-221-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'th/difftool-diffall'Junio C Hamano2012-07-231-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: only copy back files modified during directory diffTim Henigan2012-07-191-2/+5
* | | | | | | | | Merge branch 'sl/autoconf'Junio C Hamano2012-07-232-27/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | build: reconfigure automatically if configure.ac changesStefano Lattarini2012-07-192-0/+14
| * | | | | | | | | build: "make clean" should not remove configure-generated filesStefano Lattarini2012-07-191-2/+3
| * | | | | | | | | autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'Stefano Lattarini2012-07-191-11/+17
| * | | | | | | | | autoconf: remove few redundant semicolonsStefano Lattarini2012-07-191-2/+2
| * | | | | | | | | autoconf: remove some redundant shell indirectionsStefano Lattarini2012-07-191-7/+5
| * | | | | | | | | autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBSTStefano Lattarini2012-07-191-12/+12
| * | | | | | | | | autoconf: GIT_CONF_APPEND_LINE: change signatureStefano Lattarini2012-07-191-14/+14
* | | | | | | | | | Merge branch 'jv/maint-no-ext-diff'Junio C Hamano2012-07-232-3/+64
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: test precedence of external diff driversJeff King2012-07-191-0/+40
| * | | | | | | | | | diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2012-07-172-3/+24
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'kk/maint-commit-tree'Junio C Hamano2012-07-233-4/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "git-commit-tree(1): update synopsis"Junio C Hamano2012-07-171-1/+1
| * | | | | | | | | | Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeJunio C Hamano2012-07-172-3/+17
| |\ \ \ \ \ \ \ \ \ \