summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* log: do not shorten decoration names too earlymg/log-decorate-HEADJunio C Hamano2015-05-131-18/+16
* log: decorate HEAD with branch name under --decorate=full, tooJunio C Hamano2015-05-132-6/+19
* log: decorate HEAD with branch nameJunio C Hamano2015-03-103-13/+72
* Merge branch 'jc/decorate-leaky-separator-color' into HEADJunio C Hamano2015-03-103-57/+84
|\
| * log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-colorJunio C Hamano2015-03-043-8/+16
| * Documentation/config.txt: simplify boolean description in the syntax sectionJunio C Hamano2015-03-041-2/+2
| * Documentation/config.txt: describe 'color' value type in the "Values" sectionJunio C Hamano2015-03-041-16/+13
| * Documentation/config.txt: have a separate "Values" sectionJunio C Hamano2015-03-041-8/+31
| * Documentation/config.txt: describe the structure first and then meaningJunio C Hamano2015-03-041-16/+15
| * Documentation/config.txt: explain multi-valued variables onceJunio C Hamano2015-03-041-4/+3
| * Documentation/config.txt: avoid unnecessary negationJunio C Hamano2015-03-041-3/+3
* | Git 2.3.2v2.3.2Junio C Hamano2015-03-063-2/+14
* | Merge branch 'rj/no-xopen-source-for-cygwin' into maintJunio C Hamano2015-03-061-6/+0
|\ \
| * | git-compat-util.h: remove redundant coderj/no-xopen-source-for-cygwinRamsay Jones2015-02-221-6/+0
* | | Merge branch 'rs/simple-cleanups' into maintJunio C Hamano2015-03-064-13/+7
|\ \ \
| * | | sha1_name: use strlcpy() to copy stringsrs/simple-cleanupsRené Scharfe2015-02-221-6/+2
| * | | pretty: use starts_with() to check for a prefixRené Scharfe2015-02-221-1/+1
| * | | for-each-ref: use skip_prefix() to avoid duplicate string comparisonRené Scharfe2015-02-221-4/+3
| * | | connect: use strcmp() for string comparisonRené Scharfe2015-02-221-2/+1
* | | | Merge branch 'mm/am-c-doc' into maintJunio C Hamano2015-03-062-1/+9
|\ \ \ \
| * | | | Documentation/git-am.txt: mention mailinfo.scissors config variablemm/am-c-docMatthieu Moy2015-02-201-1/+2
| * | | | Documentation/config.txt: document mailinfo.scissorsMatthieu Moy2015-02-201-0/+7
* | | | | Merge branch 'ew/svn-maint-fixes' into maintJunio C Hamano2015-03-063-1/+13
|\ \ \ \ \
| * | | | | Git::SVN::*: avoid premature FileHandle closureew/svn-maint-fixesKyle J. McKay2015-02-262-0/+11
| * | | | | git-svn: fix localtime=true on non-glibc environmentsRyuichi Kokubo2015-02-261-1/+2
* | | | | | Merge branch 'km/send-email-getopt-long-workarounds' into maintJunio C Hamano2015-03-062-5/+15
|\ \ \ \ \ \
| * | | | | | git-send-email.perl: support no- prefix with older GetOptionskm/send-email-getopt-long-workaroundsKyle J. McKay2015-02-162-5/+15
* | | | | | | Prepare for 2.3.2Junio C Hamano2015-03-052-1/+69
* | | | | | | Merge branch 'sb/plug-leak-in-make-cache-entry' into maintJunio C Hamano2015-03-051-2/+8
|\ \ \ \ \ \ \
| * | | | | | | read-cache.c: free cache entry when refreshing failssb/plug-leak-in-make-cache-entryStefan Beller2015-02-171-2/+8
* | | | | | | | Merge branch 'jk/fast-import-die-nicely-fix' into maintJunio C Hamano2015-03-051-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-import: avoid running end_packfile recursivelyjk/fast-import-die-nicely-fixJeff King2015-02-101-1/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano2015-03-051-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/blame: destroy initialized commit_info onlyes/blame-commit-info-fixEric Sunshine2015-02-101-3/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano2015-03-052-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-file: correctly open files when in a subdirab/merge-file-prefixAleksander Boruch-Gruszecki2015-02-112-2/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'ps/submodule-sanitize-path-upon-add' into maintJunio C Hamano2015-03-052-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | git-submodule.sh: fix '/././' path normalizationps/submodule-sanitize-path-upon-addPatrick Steinhardt2015-02-022-1/+18
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/prune-mtime' into maintJunio C Hamano2015-03-053-13/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1_file: fix iterating loose alternate objectsJonathon Mah2015-02-092-3/+18
| * | | | | | | | for_each_loose_file_in_objdir: take an optional strbuf pathJeff King2015-02-092-10/+30
* | | | | | | | | Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maintJunio C Hamano2015-03-051-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: handle broken curl version number in version checktc/curl-vernum-output-broken-in-7.11Tom G. Christensen2015-02-031-2/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'es/squelch-openssl-warnings-on-macosx' into maintJunio C Hamano2015-03-051-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIREDes/squelch-openssl-warnings-on-macosxKyle J. McKay2015-02-091-3/+6
* | | | | | | | | | Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2015-03-052-8/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CodingGuidelines: describe naming rules for configuration variablesjc/conf-var-docJunio C Hamano2015-02-021-0/+23
| * | | | | | | | | | config.txt: mark deprecated variables more prominentlyJunio C Hamano2015-01-281-4/+4
| * | | | | | | | | | config.txt: clarify that add.ignore-errors is deprecatedJunio C Hamano2015-01-281-5/+4
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'av/wincred-with-at-in-username-fix' into maintJunio C Hamano2015-03-051-3/+22
|\ \ \ \ \ \ \ \ \ \