Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | send-email: ignore trailing whitespace in mailrc alias filejk/send-email-rtrim-mailrc-alias | Jeff King | 2016-03-18 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'da/mergetool-delete-delete-conflict' into maint | Junio C Hamano | 2016-04-14 | 2 | -4/+85 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflict | David Aguilar | 2016-03-10 | 2 | -1/+35 | |
| * | | | | | | | | | | | | mergetool: support delete/delete conflicts | David Aguilar | 2016-03-10 | 2 | -3/+50 | |
* | | | | | | | | | | | | | Merge branch 'jk/startup-info' into maint | Junio C Hamano | 2016-04-14 | 13 | -26/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | use setup_git_directory() in test-* programsjk/startup-info | Jeff King | 2016-03-07 | 2 | -0/+4 | |
| * | | | | | | | | | | | | | grep: turn off gitlink detection for --no-index | Jeff King | 2016-03-07 | 2 | -2/+31 | |
| * | | | | | | | | | | | | | mailmap: do not resolve blobs in a non-repository | Jeff King | 2016-03-06 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | remote: don't resolve HEAD in non-repository | Jeff King | 2016-03-06 | 1 | -5/+6 | |
| * | | | | | | | | | | | | | setup: set startup_info->have_repository more reliably | Jeff King | 2016-03-06 | 2 | -1/+4 | |
| * | | | | | | | | | | | | | setup: make startup_info available everywhere | Jeff King | 2016-03-06 | 6 | -17/+7 | |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/getwholeline-getdelim-empty' into maint | Junio C Hamano | 2016-04-14 | 2 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorjk/getwholeline-getdelim-empty | Jeff King | 2016-03-05 | 2 | -1/+11 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | xdiff/xprepare: fix a memory leakrj/xdiff-prepare-plug-leak-on-error-codepath | Ramsay Jones | 2016-03-04 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits | Ramsay Jones | 2016-03-04 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint | Junio C Hamano | 2016-04-14 | 3 | -3/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | fetch-pack: update the documentation for "<refs>..." argumentsgf/fetch-pack-direct-object-fetch | Gabriel Souza Franco | 2016-03-05 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1 | Gabriel Souza Franco | 2016-03-01 | 2 | -3/+27 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-local-env-vars' into maint | Junio C Hamano | 2016-04-14 | 2 | -18/+77 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | rev-parse: let some options run outside repositoryjk/rev-parse-local-env-vars | Jeff King | 2016-02-29 | 2 | -20/+34 | |
| * | | | | | | | | | | | | | | | t1515: add tests for rev-parse out-of-repo helpers | Jeff King | 2016-02-28 | 1 | -0/+45 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/config-get-urlmatch' into maint | Junio C Hamano | 2016-04-14 | 3 | -11/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Documentation/git-config: fix --get-all descriptionjk/config-get-urlmatch | John Keeping | 2016-02-28 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | Documentation/git-config: use bulleted list for exit codes | John Keeping | 2016-02-28 | 1 | -7/+7 | |
| * | | | | | | | | | | | | | | | config: fail if --get-urlmatch finds no value | John Keeping | 2016-02-28 | 3 | -2/+8 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'pb/t7502-drop-dup' into maint | Junio C Hamano | 2016-04-14 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | t/t7502 : drop duplicate testpb/t7502-drop-dup | Pranit Bauva | 2016-03-11 | 1 | -5/+0 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/test-httpd-config-nosystem' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envjk/test-httpd-config-nosystem | Jeff King | 2016-03-18 | 1 | -0/+1 | |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'sb/clone-t57-t56' into maint | Junio C Hamano | 2016-04-14 | 10 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | clone tests: rename t57* => t56*sb/clone-t57-t56 | Stefan Beller | 2016-03-16 | 10 | -0/+0 | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/credential-cache-comment-exit' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | credential-cache--daemon: clarify "exit" action semanticsjk/credential-cache-comment-exit | Jeff King | 2016-03-18 | 1 | -1/+10 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'jc/index-pack' into maint | Junio C Hamano | 2016-04-14 | 2 | -18/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | index-pack: add a helper function to derive .idx/.keep filenamejc/index-pack | Junio C Hamano | 2016-03-03 | 1 | -18/+17 | |
| * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-pack | Junio C Hamano | 2016-03-03 | 2 | -1/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keep | Junio C Hamano | 2016-03-03 | 2 | -1/+7 | |
* | | | | | | | | | | | | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint | Junio C Hamano | 2016-04-14 | 3 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | dir: store EXC_FLAG_* values in unsigned integersss/exc-flag-is-a-collection-of-bits | Saurav Sachidanand | 2016-03-01 | 3 | -9/+9 | |
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'mp/upload-pack-use-embedded-args' into maint | Junio C Hamano | 2016-04-14 | 1 | -14/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | upload-pack: use argv_array for pack_objectsmp/upload-pack-use-embedded-args | Michael Procter | 2016-02-25 | 1 | -14/+11 | |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'oa/doc-diff-check' into maint | Junio C Hamano | 2016-04-14 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Documentation: git diff --check detects conflict markersoa/doc-diff-check | Ori Avtalion | 2016-03-29 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'pb/opt-cmdmode-doc' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | api-parse-options.txt: document OPT_CMDMODE()pb/opt-cmdmode-doc | Pranit Bauva | 2016-03-25 | 1 | -0/+7 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/apply-doc' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | git-apply.txt: mention the behavior inside a subdirnd/apply-doc | Nguyễn Thái Ngọc Duy | 2016-03-24 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | git-apply.txt: remove a space | Nguyễn Thái Ngọc Duy | 2016-03-24 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'cc/doc-recommend-performance-trace-to-file' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |