Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'sg/diff-multiple-identical-renames' into maint | Junio C Hamano | 2016-04-29 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | diffcore: fix iteration order of identical files during rename detectionsg/diff-multiple-identical-renames | SZEDER Gábor | 2016-03-30 | 1 | -0/+11 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jv/merge-nothing-into-void' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-void | Junio C Hamano | 2016-03-23 | 1 | -0/+10 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'ss/commit-squash-msg' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+28 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msg | Sven Strickroth | 2016-03-21 | 1 | -0/+28 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'da/mergetool-delete-delete-conflict' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+64 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflict | David Aguilar | 2016-03-10 | 1 | -0/+25 | |
| * | | | | | | | | | | mergetool: support delete/delete conflicts | David Aguilar | 2016-03-10 | 1 | -0/+39 | |
* | | | | | | | | | | | Merge branch 'jk/startup-info' into maint | Junio C Hamano | 2016-04-14 | 2 | -5/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | grep: turn off gitlink detection for --no-index | Jeff King | 2016-03-07 | 1 | -0/+27 | |
| * | | | | | | | | | | | setup: make startup_info available everywhere | Jeff King | 2016-03-06 | 1 | -5/+0 | |
* | | | | | | | | | | | | Merge branch 'jk/getwholeline-getdelim-empty' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorjk/getwholeline-getdelim-empty | Jeff King | 2016-03-05 | 1 | -0/+4 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1 | Gabriel Souza Franco | 2016-03-01 | 1 | -0/+14 | |
* | | | | | | | | | | | | | Merge branch 'jk/rev-parse-local-env-vars' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | rev-parse: let some options run outside repositoryjk/rev-parse-local-env-vars | Jeff King | 2016-02-29 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | 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 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | config: fail if --get-urlmatch finds no value | John Keeping | 2016-02-28 | 1 | -0/+3 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | 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/pack-idx-corruption-safety' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+179 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/config-set-in-non-repository' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-module-list-fix' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/grep-binary-workaround-in-test' into maint | Junio C Hamano | 2016-03-10 | 2 | -13/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/git-common-dir-fix' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint | Junio C Hamano | 2016-03-10 | 2 | -26/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/epipe-in-async' into maint | Junio C Hamano | 2016-03-10 | 2 | -2/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/config-error' into maint | Junio C Hamano | 2016-03-10 | 2 | -1/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/work-tree-tests' into maint | Junio C Hamano | 2016-03-10 | 3 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/index-pack' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-pack | Junio C Hamano | 2016-03-03 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keep | Junio C Hamano | 2016-03-03 | 1 | -0/+6 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8' | Junio C Hamano | 2016-03-24 | 2 | -11/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | mingw: skip some tests in t9115 due to file name issues | Johannes Schindelin | 2016-03-23 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | t1300: fix the new --show-origin tests on Windows | Johannes Schindelin | 2016-03-23 | 1 | -3/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | t1300-repo-config: make it resilient to being run via 'sh -x' | Johannes Schindelin | 2016-03-23 | 1 | -6/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-module-list-pathspec-fix' | Junio C Hamano | 2016-03-24 | 1 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | submodule: fix regression for deinit without submodules | Stefan Beller | 2016-03-22 | 1 | -0/+13 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'nd/exclusion-regression-fix'" | Junio C Hamano | 2016-03-18 | 2 | -155/+5 | |
* | | | | | | | | | | | | | | | | | | | | | git-svn: fix URL canonicalization during init w/ SVN 1.7+ | Eric Wong | 2016-03-16 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | t9117: test specifying full url to git svn init -T | Adam Dinwoodie | 2016-03-16 | 1 | -0/+6 | |
* | | | | | | | | | | | | | | | | | | | | | git-svn: shorten glob error message | Eric Wong | 2016-03-15 | 3 | -9/+16 | |
* | | | | | | | | | | | | | | | | | | | | | git-svn: loosen config globs limitations | Victor Leschuk | 2016-03-15 | 1 | -0/+222 |