summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* tree-walk: convert fill_tree_descriptor() to object_idrs/object-idRené Scharfe2017-08-148-23/+23
* The first batch of topics after the 2.14 cycleJunio C Hamano2017-08-112-1/+134
* Merge branch 'ma/pager-per-subcommand-action'Junio C Hamano2017-08-116-76/+201
|\
| * git.c: ignore pager.* when launching builtin as dashed externalma/pager-per-subcommand-actionMartin Ågren2017-08-032-2/+2
| * tag: change default of `pager.tag` to "on"Martin Ågren2017-08-033-16/+16
| * tag: respect `pager.tag` in list-mode onlyMartin Ågren2017-08-034-2/+21
| * t7006: add tests for how git tag paginatesMartin Ågren2017-08-031-0/+67
| * git.c: provide setup_auto_pager()Martin Ågren2017-08-032-0/+22
| * git.c: let builtins opt for handling `pager.foo` themselvesMartin Ågren2017-08-032-1/+11
| * builtin.h: take over documentation from api-builtin.txtMartin Ågren2017-08-032-73/+80
* | Merge branch 'jk/rev-list-empty-input'Junio C Hamano2017-08-115-13/+26
|\ \
| * | revision: do not fallback to default when rev_input_given is setjk/rev-list-empty-inputJeff King2017-08-022-1/+7
| * | rev-list: don't show usage when we see empty ref patternsJeff King2017-08-022-4/+5
| * | revision: add rev_input_given flagJeff King2017-08-022-0/+8
| * | t6018: flesh out empty input/output rev-list testsJeff King2017-08-021-11/+9
| |/
* | Merge branch 'jt/t1450-fsck-corrupt-packfile'Junio C Hamano2017-08-111-0/+16
|\ \
| * | tests: ensure fsck fails on corrupt packfilesjt/t1450-fsck-corrupt-packfileJonathan Tan2017-07-281-0/+16
* | | Merge branch 'js/git-gui-msgfmt-on-windows'Junio C Hamano2017-08-112-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
| | |/ /
* | | | Merge branch 'eb/contacts-reported-by'Junio C Hamano2017-08-111-1/+1
|\ \ \ \
| * | | | git-contacts: also recognise "Reported-by:"eb/contacts-reported-byEric Blake2017-07-271-1/+1
| |/ / /
* | | | Merge branch 'dl/credential-cache-socket-in-xdg-cache'Junio C Hamano2017-08-111-1/+1
|\ \ \ \
| * | | | credential-cache: interpret an ECONNRESET as an EOFdl/credential-cache-socket-in-xdg-cacheRamsay Jones2017-07-271-1/+1
* | | | | Merge branch 'rg/rerere-train-overwrite'Junio C Hamano2017-08-111-2/+52
|\ \ \ \ \
| * | | | | contrib/rerere-train: optionally overwrite existing resolutionsrg/rerere-train-overwriteRaman Gupta2017-07-261-2/+52
| | |/ / / | |/| | |
* | | | | Merge branch 'jb/t8008-cleanup'Junio C Hamano2017-08-111-14/+16
|\ \ \ \ \
| * | | | | t8008: rely on rev-parse'd HEAD instead of sha1 valuejb/t8008-cleanupStefan Beller2017-07-261-14/+16
| |/ / / /
* | | | | Merge branch 'jt/subprocess-handshake'Junio C Hamano2017-08-117-151/+161
|\ \ \ \ \
| * | | | | sub-process: refactor handshake to common functionjt/subprocess-handshakeJonathan Tan2017-07-266-90/+138
| * | | | | Documentation: migrate sub-process docs to headerJonathan Tan2017-07-262-61/+23
| * | | | | Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-269-161/+668
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge branch 'dc/fmt-merge-msg-microcleanup'Junio C Hamano2017-08-111-1/+2
|\ \ \ \ \ \
| * | | | | | fmt-merge-msg: fix coding styledc/fmt-merge-msg-microcleanupDimitrios Christidis2017-07-251-1/+2
* | | | | | | Merge branch 'ah/doc-wserrorhighlight'Junio C Hamano2017-08-112-13/+15
|\ \ \ \ \ \ \
| * | | | | | | doc: add missing values "none" and "default" for diff.wsErrorHighlightah/doc-wserrorhighlightAndreas Heiduk2017-07-252-13/+15
| |/ / / / / /
* | | | | | | Merge branch 'cc/ref-is-hidden-microcleanup'Junio C Hamano2017-08-111-5/+4
|\ \ \ \ \ \ \
| * | | | | | | refs: use skip_prefix() in ref_is_hidden()cc/ref-is-hidden-microcleanupChristian Couder2017-07-241-5/+4
| |/ / / / / /
* | | | | | | Merge branch 'js/run-process-parallel-api-fix'Junio C Hamano2017-08-112-3/+3
|\ \ \ \ \ \ \
| * | | | | | | run_processes_parallel: change confusing task_cb conventionjs/run-process-parallel-api-fixJohannes Schindelin2017-07-212-3/+3
* | | | | | | | Merge branch 'hb/gitweb-project-list'Junio C Hamano2017-08-111-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: skip unreadable subdirectorieshb/gitweb-project-listHielke Christian Braun2017-07-181-0/+2
* | | | | | | | | Merge branch 'ks/commit-abort-on-empty-message-fix'Junio C Hamano2017-08-111-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: check for empty message before the check for untouched templateks/commit-abort-on-empty-message-fixKaartic Sivaraam2017-07-171-5/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sb/hashmap-cleanup'Junio C Hamano2017-08-1112-75/+107
|\ \ \ \ \ \ \ \ \