Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/hooks' | Junio C Hamano | 2016-08-19 | 1 | -0/+6 |
|\ | |||||
| * | rev-parse: respect core.hooksPath in --git-pathab/hooks | Johannes Schindelin | 2016-08-16 | 1 | -0/+6 |
* | | Merge branch 'jk/difftool-command-not-found' | Junio C Hamano | 2016-08-19 | 1 | -0/+6 |
|\ \ | |||||
| * | | difftool: always honor fatal error exit codesjk/difftool-command-not-found | John Keeping | 2016-08-15 | 1 | -0/+6 |
* | | | Merge branch 'sb/checkout-explit-detach-no-advice' | Junio C Hamano | 2016-08-19 | 1 | -0/+23 |
|\ \ \ | |||||
| * | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-advice | Stefan Beller | 2016-08-15 | 1 | -0/+23 |
| |/ / | |||||
* | | | Merge branch 'tb/t0027-raciness-fix' | Junio C Hamano | 2016-08-19 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | convert: Correct NNO tests and missing `LF will be replaced by CRLF`tb/t0027-raciness-fix | Torsten Bögershausen | 2016-08-14 | 1 | -3/+3 |
* | | | | Merge branch 'rs/pull-signed-tag' | Junio C Hamano | 2016-08-19 | 1 | -0/+18 |
|\ \ \ \ | |||||
| * | | | | merge-recursive: fix verbose output for multiple base trees | René Scharfe | 2016-08-13 | 1 | -0/+18 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'js/test-lint-pathname' | Junio C Hamano | 2016-08-17 | 1 | -1/+10 |
|\ \ \ \ | |||||
| * | | | | t/Makefile: ensure that paths are valid on platforms we carejs/test-lint-pathname | Johannes Schindelin | 2016-08-16 | 1 | -1/+10 |
| |/ / / | |||||
| * | | | Merge branch 'jk/difftool-in-subdir' into maint | Junio C Hamano | 2016-08-12 | 1 | -0/+14 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rs/use-strbuf-addstr' into maint | Junio C Hamano | 2016-08-10 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/t4205-cleanup' into maint | Junio C Hamano | 2016-08-10 | 1 | -198/+200 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'nd/fbsd-lazy-mtime' into maint | Junio C Hamano | 2016-08-10 | 1 | -1/+16 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'js/t4130-rename-without-ino' into maint | Junio C Hamano | 2016-08-10 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/grep-commandline-vs-configuration' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint | Junio C Hamano | 2016-08-10 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mm/status-suggest-merge-abort' into maint | Junio C Hamano | 2016-08-10 | 2 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/submodule-config-code-cleanup' into maint | Junio C Hamano | 2016-08-08 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-08-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/unpack-trees-advice-messages' into maint | Junio C Hamano | 2016-08-08 | 3 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/pack-ofs-4gb-limit' into maint | Junio C Hamano | 2016-08-08 | 1 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/ignore-space-at-eol' into maint | Junio C Hamano | 2016-08-08 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-scrub-url' into maint | Junio C Hamano | 2016-08-08 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/cache-tree-ita' into maint | Junio C Hamano | 2016-08-08 | 14 | -50/+76 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/blame-worktree' into maint | Junio C Hamano | 2016-08-08 | 1 | -17/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/reflog-past-root' | Junio C Hamano | 2016-08-17 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | t1410: remove superfluous 'git reflog' from the 'walk past root' testsg/reflog-past-root | SZEDER Gábor | 2016-08-15 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | | | t7411: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-08-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | t5520: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-08-12 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | t3404: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-08-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'kw/patch-ids-optim' | Junio C Hamano | 2016-08-12 | 2 | -0/+57 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | rebase: avoid computing unnecessary patch IDs | Kevin Willford | 2016-08-11 | 2 | -0/+57 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'vs/typofix' | Junio C Hamano | 2016-08-12 | 9 | -13/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Spelling fixesvs/typofix | Ville Skyttä | 2016-08-11 | 9 | -13/+13 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-dot-branch' | Junio C Hamano | 2016-08-10 | 1 | -9/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | t7406: fix breakage on OSXsb/submodule-update-dot-branch | Stefan Beller | 2016-08-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | submodule update: allow '.' for branch value | Stefan Beller | 2016-08-03 | 1 | -1/+34 |
| * | | | | | | | | | | | | | | | | | | | | | | | submodule update: respect depth in subsequent fetches | Stefan Beller | 2016-08-01 | 1 | -0/+16 |
| * | | | | | | | | | | | | | | | | | | | | | | | t7406: future proof tests with hard coded depth | Stefan Beller | 2016-08-01 | 1 | -8/+11 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/am-3-merge-recursive-direct' | Junio C Hamano | 2016-08-10 | 1 | -0/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | t5520: verify that `pull --rebase` shows the helpful advice when failing | Johannes Schindelin | 2016-07-26 | 1 | -0/+32 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-from-config' | Junio C Hamano | 2016-08-10 | 1 | -0/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: format.from gives the default for --fromjt/format-patch-from-config | Josh Triplett | 2016-08-01 | 1 | -0/+40 |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-force-with-lease-creation' | Junio C Hamano | 2016-08-10 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | t5533: make it pass on case-sensitive filesystemsjk/push-force-with-lease-creation | Johannes Schindelin | 2016-08-04 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | push: allow pushing new branches with --force-with-lease | John Keeping | 2016-07-26 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | | | | | | | | | | | push: add shorthand for --force-with-lease branch creation | John Keeping | 2016-07-26 | 1 | -0/+26 |