Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bisect: add test for the bisect algorithm | Stephan Beyer | 2016-04-15 | 1 | -0/+155 |
* | t6030: generalize test to not rely on current implementation | Stephan Beyer | 2016-04-15 | 1 | -84/+87 |
* | t: use test_cmp_rev() where appropriate | Stephan Beyer | 2016-04-15 | 29 | -253/+232 |
* | t/test-lib-functions.sh: generalize test_cmp_rev | Stephan Beyer | 2016-04-15 | 1 | -4/+10 |
* | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' | Junio C Hamano | 2016-04-13 | 1 | -0/+14 |
|\ | |||||
| * | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlf | Torsten Bögershausen | 2016-04-05 | 1 | -0/+14 |
* | | Merge branch 'lt/pretty-expand-tabs' | Junio C Hamano | 2016-04-13 | 2 | -1/+106 |
|\ \ | |||||
| * | | pretty: test --expand-tabslt/pretty-expand-tabs | Junio C Hamano | 2016-04-04 | 1 | -0/+105 |
| * | | pretty: enable --expand-tabs by default for selected pretty formats | Junio C Hamano | 2016-03-30 | 1 | -1/+1 |
* | | | Merge branch 'mj/pull-rebase-autostash' | Junio C Hamano | 2016-04-13 | 1 | -7/+67 |
|\ \ \ | |||||
| * | | | t5520: test --[no-]autostash with pull.rebase=truemj/pull-rebase-autostash | Mehul Jain | 2016-04-04 | 1 | -0/+10 |
| * | | | t5520: reduce commom lines of code | Mehul Jain | 2016-04-04 | 1 | -9/+7 |
| * | | | t5520: factor out common "failing autostash" code | Mehul Jain | 2016-04-04 | 1 | -15/+11 |
| * | | | t5520: factor out common "successful autostash" code | Mehul Jain | 2016-04-04 | 1 | -29/+15 |
| * | | | t5520: use better test to check stderr output | Mehul Jain | 2016-04-04 | 1 | -6/+4 |
| * | | | t5520: ensure consistent test conditions | Mehul Jain | 2016-04-04 | 1 | -0/+2 |
| * | | | t5520: use consistent capitalization in test titles | Mehul Jain | 2016-04-04 | 1 | -2/+2 |
| * | | | pull --rebase: add --[no-]autostash flag | Mehul Jain | 2016-03-21 | 1 | -0/+70 |
* | | | | Merge branch 'sk/send-pack-all-fix' | Junio C Hamano | 2016-04-13 | 1 | -0/+12 |
|\ \ \ \ | |||||
| * | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fix | Stanislav Kolotinskiy | 2016-03-31 | 1 | -0/+12 |
* | | | | | Merge branch 'sg/diff-multiple-identical-renames' | Junio C Hamano | 2016-04-13 | 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 'ky/branch-d-worktree' | Junio C Hamano | 2016-04-13 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktree | Kazuki Yamaguchi | 2016-03-29 | 1 | -0/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'rz/worktree-no-checkout' | Junio C Hamano | 2016-04-13 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | worktree: add: introduce --checkout optionrz/worktree-no-checkout | Ray Zhang | 2016-03-29 | 1 | -0/+12 |
* | | | | | | Merge branch 'jc/merge-refuse-new-root' | Junio C Hamano | 2016-04-08 | 10 | -11/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge: refuse to create too cool a merge by default | Junio C Hamano | 2016-03-23 | 10 | -11/+35 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'la/tag-force-signing-annotated-tags' | Junio C Hamano | 2016-04-06 | 1 | -0/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tags | Laurent Arnoud | 2016-03-22 | 1 | -0/+41 |
* | | | | | | | Merge branch 'jk/submodule-c-credential' | Junio C Hamano | 2016-04-06 | 3 | -0/+57 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS | Jeff King | 2016-03-23 | 1 | -0/+14 |
| * | | | | | | | git: submodule honor -c credential.* from command line | Jacob Keller | 2016-03-01 | 2 | -0/+43 |
* | | | | | | | | Merge branch 'jv/merge-nothing-into-void' | Junio C Hamano | 2016-04-06 | 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' | Junio C Hamano | 2016-04-06 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msg | Sven Strickroth | 2016-03-21 | 1 | -0/+28 |
* | | | | | | | | | Merge branch 'sb/rebase-x' | Junio C Hamano | 2016-04-06 | 1 | -13/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t3404: cleanup double empty lines between testssb/rebase-x | Stefan Beller | 2016-03-18 | 1 | -6/+0 |
| * | | | | | | | | | rebase: decouple --exec from --interactive | Stefan Beller | 2016-03-18 | 1 | -7/+6 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/test-httpd-config-nosystem' | Junio C Hamano | 2016-04-06 | 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' | Junio C Hamano | 2016-04-06 | 10 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clone tests: rename t57* => t56*sb/clone-t57-t56 | Stefan Beller | 2016-03-16 | 10 | -0/+0 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'ls/p4-map-user' | Junio C Hamano | 2016-04-06 | 1 | -0/+61 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-p4: map a P4 user to Git author name and email addressls/p4-map-user | Lars Schneider | 2016-03-15 | 1 | -0/+61 |
| |/ / / / / / / / | |||||
| * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ |