summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.11.5v1.7.11.5Junio C Hamano2012-08-153-2/+11
* Merge branch 'rj/maint-grep-remove-redundant-test' into maintJunio C Hamano2012-08-151-11/+0
|\
| * t7810-*.sh: Remove redundant testRamsay Jones2012-07-291-11/+0
* | Merge branch 'hv/link-alt-odb-entry' into maintJunio C Hamano2012-08-151-1/+1
|\ \
| * | link_alt_odb_entry: fix read over array bounds reported by valgrindHeiko Voigt2012-07-291-1/+1
| |/
* | Prepare for 1.7.11.5Junio C Hamano2012-08-062-1/+29
* | Merge branch 'jn/block-sha1' into maintJunio C Hamano2012-08-062-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' into maintJunio C Hamano2012-08-061-1/+1
|\ \ \
| * | | Makefile: fix location of listing produced by "make subdir/foo.s"Jonathan Nieder2012-07-221-1/+1
| | |/ | |/|
* | | Merge branch 'ms/daemon-doc-typo' into maintJunio C Hamano2012-08-061-1/+1
|\ \ \
| * | | Documentation/git-daemon: add missing wordMichael Schubert2012-07-161-1/+1
* | | | Merge branch 'lm/git-blame-el' into maintJunio C Hamano2012-08-061-36/+37
|\ \ \ \
| * | | | git-blame.el: Do not use bare 0 to mean (point-min)Lawrence Mitchell2012-06-141-1/+1
| * | | | git-blame.el: Use with-current-buffer where appropriateLawrence Mitchell2012-06-141-37/+37
| * | | | git-blame.el: Do not use goto-line in lisp codeRüdiger Sonderfeld2012-06-141-1/+2
* | | | | Merge branch 'rs/ipv6-ssh-url' into maintJunio C Hamano2012-08-061-1/+1
|\ \ \ \ \
| * | | | | git: Wrong parsing of ssh urls with IPv6 literals ignores portRené Scharfe2012-06-131-1/+1
* | | | | | Merge branch 'rs/git-blame-mapcar-mapc' into maintJunio C Hamano2012-08-061-1/+1
|\ \ \ \ \ \
| * | | | | | git-blame.el: use mapc instead of mapcarRüdiger Sonderfeld2012-06-101-1/+1
* | | | | | | Merge branch 'rr/doc-commit' into maintJunio C Hamano2012-08-061-0/+8
|\ \ \ \ \ \ \
| * | | | | | | commit: document a couple of optionsRamkumar Ramachandra2012-06-081-0/+8
* | | | | | | | doc: A few minor copy edits.Štěpán Němec2012-08-065-10/+10
* | | | | | | | Merge branch 'jk/maint-checkout-orphan-check-fix' into maintJunio C Hamano2012-08-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: don't confuse ref and object flagsJeff King2012-07-251-1/+1
* | | | | | | | | Merge branch 'mh/maint-revisions-doc' into maintJunio C Hamano2012-08-061-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
* | | | | | | | | | Merge branch 'jc/mergetool-tool-help' into maintJunio C Hamano2012-08-063-5/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mergetool: support --tool-help option like difftool doesJunio C Hamano2012-07-233-5/+49
* | | | | | | | | | | Git 1.7.11.4v1.7.11.4Junio C Hamano2012-07-304-3/+35
* | | | | | | | | | | Merge branch 'jk/maint-commit-document-editmsg' into maintJunio C Hamano2012-07-301-0/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: document the temporary commit message fileJeff King2012-07-231-0/+9
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/maint-advise-vaddf' into maintJunio C Hamano2012-07-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | advice: pass varargs to strbuf_vaddf, not strbuf_addfJeff King2012-07-231-1/+1
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'kk/maint-commit-tree' into maintJunio C Hamano2012-07-303-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
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | commit-tree: resurrect command line parsing updatesJunio C Hamano2012-07-172-3/+17
* | | | | | | | | | | | | Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2012-07-302-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 'pg/maint-1.7.9-am-where-is-patch' into maintJunio C Hamano2012-07-302-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am: indicate where a failed patch is to be foundPaul Gortmaker2012-07-132-0/+8
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maintJunio C Hamano2012-07-302-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodules: don't stumble over symbolic links when cloning recursivelyJens Lehmann2012-07-122-2/+17
* | | | | | | | | | | | | | Merge branch 'jc/maint-filter-branch-epoch-date' into maintJunio C Hamano2012-07-304-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | t7003: add test to filter a branch with a commit at epochJunio C Hamano2012-07-122-3/+13