summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | rev-list: check reflog_info before showing usageJeff King2017-07-094-1/+13
| * | | | | | | | | get_revision_1(): replace do-while with an early returnJeff King2017-07-091-6/+5
| * | | | | | | | | log: do not free parents when walking reflogJeff King2017-07-091-2/+2
| * | | | | | | | | log: clarify comment about reflog cyclesJeff King2017-07-091-1/+4
| * | | | | | | | | revision: disallow reflog walking with revs->limitedJeff King2017-07-071-0/+2
| * | | | | | | | | t1414: document some reflog-walk odditiesJeff King2017-07-072-10/+105
| * | | | | | | | | Merge branch 'jk/reflog-walk-maint' into jk/reflog-walkJunio C Hamano2017-07-073-12/+42
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maintJunio C Hamano2017-08-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http.c: http.sslcert and http.sslkey are both pathnamesjc/http-sslkey-and-ssl-cert-are-pathsJunio C Hamano2017-07-201-2/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-2322-220/+362
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ref-filter: consult want_color() before emitting colorsjk/ref-filter-colorsJeff King2017-07-136-12/+93
| * | | | | | | | | | | pretty: respect color settings for %C placeholdersJeff King2017-07-133-45/+84
| * | | | | | | | | | | rev-list: pass diffopt->use_colors through to pretty-printJeff King2017-07-132-0/+12
| * | | | | | | | | | | for-each-ref: load config earlierJeff King2017-07-131-3/+2
| * | | | | | | | | | | color: check color.ui in git_default_config()Jeff King2017-07-137-16/+8
| * | | | | | | | | | | ref-filter: pass ref_format struct to atom parsersJeff King2017-07-131-17/+25
| * | | | | | | | | | | ref-filter: factor out the parsing of sorting atomsJeff King2017-07-131-4/+8
| * | | | | | | | | | | ref-filter: make parse_ref_filter_atom a private functionJeff King2017-07-132-3/+1
| * | | | | | | | | | | ref-filter: provide a function for parsing sort optionsJeff King2017-07-133-30/+11
| * | | | | | | | | | | ref-filter: move need_color_reset_at_eol into ref_formatJeff King2017-07-132-4/+6
| * | | | | | | | | | | ref-filter: abstract ref format into its own structJeff King2017-07-136-52/+70
| * | | | | | | | | | | ref-filter: simplify automatic color resetJeff King2017-07-131-5/+1
| * | | | | | | | | | | t: use test_decode_color rather than literal ANSI codesJeff King2017-07-134-39/+44
| * | | | | | | | | | | docs/for-each-ref: update pointer to color syntaxJeff King2017-07-131-2/+4
| * | | | | | | | | | | check return value of verify_ref_format()Jeff King2017-07-133-5/+10
* | | | | | | | | | | | Merge branch 'js/git-gui-msgfmt-on-windows' into maintJunio C Hamano2017-08-232-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-w...js/git-gui-msgfmt-on-windowsJunio C Hamano2017-07-252-7/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | git-gui (MinGW): make use of MSys2's msgfmtJohannes Schindelin2017-07-251-0/+2
| | * | | | | | | | | | | Merge remote-tracking branch 'philoakley/dup-gui'Pat Thoyts2017-03-181-7/+10
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | git gui: allow for a long recentrepo listPhilip Oakley2017-01-201-1/+5
| | | * | | | | | | | | | | git gui: de-dup selected repo from recentrepo historyPhilip Oakley2017-01-201-4/+3
| | | * | | | | | | | | | | git gui: cope with duplicates in _get_recentrepoPhilip Oakley2017-01-201-2/+2
| | | * | | | | | | | | | | git-gui: remove duplicate entries from .gitconfig's gui.recentrepoPhilip Oakley2017-01-201-1/+1
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Git 2.14.1v2.14.1Junio C Hamano2017-08-043-2/+6
* | | | | | | | | | | | | Merge tag 'v2.13.5' into maintJunio C Hamano2017-08-0414-2/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Git 2.13.5v2.13.5Junio C Hamano2017-08-013-2/+6
| * | | | | | | | | | | | | Merge tag 'v2.12.4' into maintJunio C Hamano2017-08-0113-2/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Git 2.12.4v2.12.4Junio C Hamano2017-07-303-2/+6
| | * | | | | | | | | | | | | Merge tag 'v2.11.3' into maint-2.12Junio C Hamano2017-07-3011-0/+116
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Git 2.11.3v2.11.3Junio C Hamano2017-07-303-2/+6
| | | * | | | | | | | | | | | | Merge tag 'v2.10.4' into maint-2.11Junio C Hamano2017-07-3010-0/+112
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Git 2.10.4v2.10.4Junio C Hamano2017-07-303-2/+6
| | | | * | | | | | | | | | | | | Merge tag 'v2.9.5' into maint-2.10Junio C Hamano2017-07-309-0/+108
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Git 2.9.5v2.9.5maint-2.9Junio C Hamano2017-07-303-2/+6
| | | | | * | | | | | | | | | | | Merge tag 'v2.8.6' into maint-2.9Junio C Hamano2017-07-308-0/+104
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | Git 2.8.6v2.8.6maint-2.8Junio C Hamano2017-07-303-2/+6
| | | | | | * | | | | | | | | | | | Merge tag 'v2.7.6' into maint-2.8Junio C Hamano2017-07-307-0/+100
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | Git 2.7.6v2.7.6maint-2.7Junio C Hamano2017-07-303-2/+27
| | | | | | | * | | | | | | | | | | | Merge branch 'jk/ssh-funny-url' into maint-2.7Junio C Hamano2017-07-286-0/+75
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | connect: reject paths that look like command line optionsJeff King2017-07-283-0/+40