Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | 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 --from | 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 filesystems | 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 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/build-time-pager-tweaks' | Junio C Hamano | 2016-08-08 | 1 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | pager: move pager-specific setup into the build | Eric Wong | 2016-08-04 | 1 | -0/+13 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fbsd-lazy-mtime' | Junio C Hamano | 2016-08-08 | 1 | -1/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | t7063: work around FreeBSD's lazy mtime update feature | Nguyễn Thái Ngọc Duy | 2016-08-04 | 1 | -1/+16 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/log-decorate-color-head-arrow' | Junio C Hamano | 2016-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | log: decorate HEAD -> branch with the same color for arrow and HEAD | Nguyễn Thái Ngọc Duy | 2016-07-13 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addstr' | Junio C Hamano | 2016-08-08 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf | René Scharfe | 2016-08-01 | 1 | -3/+3 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/lazy-prereq-mktemp' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/icase' into maint | Junio C Hamano | 2016-07-28 | 4 | -3/+148 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-match-signal' into maint | Junio C Hamano | 2016-07-28 | 3 | -11/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/t3404-grammo-fix' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maint | Junio C Hamano | 2016-07-28 | 1 | -0/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/ita-cleanup' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+59 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maint | Junio C Hamano | 2016-07-28 | 1 | -0/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dg/subtree-rebase-test' into maint | Junio C Hamano | 2016-07-28 | 1 | -0/+119 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ib/t3700-add-chmod-x-updates' | Junio C Hamano | 2016-08-08 | 1 | -39/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3700: add a test_mode_in_index helper function | Ingo Brückl | 2016-08-01 | 1 | -32/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3700: merge two tests into one | Ingo Brückl | 2016-08-01 | 1 | -12/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3700: remove unwanted leftover files before running new tests | Ingo Brückl | 2016-08-01 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-objects-optim' | Junio C Hamano | 2016-08-08 | 1 | -0/+87 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/perf: add tests for many-pack scenarios | Jeff King | 2016-07-29 | 1 | -0/+87 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/difftool-in-subdir' | Junio C Hamano | 2016-08-08 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: avoid $GIT_DIR and $GIT_WORK_TREE | David Aguilar | 2016-07-28 | 1 | -0/+14 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/reflog-date' | Junio C Hamano | 2016-08-08 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date: add "unix" format | Jeff King | 2016-07-27 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date: document and test "raw-local" mode | Jeff King | 2016-07-27 | 1 | -0/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/t4205-cleanup' | Junio C Hamano | 2016-08-08 | 1 | -198/+200 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4205: indent here documents | Jeff King | 2016-07-27 | 1 | -196/+196 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4205: drop top-level &&-chaining | Jeff King | 2016-07-27 | 1 | -2/+4 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fetch-ref-summary' | Junio C Hamano | 2016-08-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5510: skip tests under GETTEXT_POISON build | Vasco Almeida | 2016-07-26 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/git-svn-http-tests' | Junio C Hamano | 2016-08-08 | 10 | -91/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git svn: migrate tests to use lib-httpd | Eric Wong | 2016-07-25 | 7 | -86/+30 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t91*: do not say how to avoid the tests | Michael J Gruber | 2016-07-25 | 3 | -5/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/t4130-rename-without-ino' | Junio C Hamano | 2016-08-08 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4130: work around Windows limitation | Johannes Sixt | 2016-08-03 | 1 | -3/+7 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/grep-commandline-vs-configuration' | Junio C Hamano | 2016-08-04 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: further simplify setting the pattern type | Junio C Hamano | 2016-07-25 | 1 | -0/+14 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' | Junio C Hamano | 2016-08-04 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: do not reuse worktree files that need "clean" conversion | Jeff King | 2016-07-22 | 1 | -0/+11 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/submodule-config-code-cleanup' | Junio C Hamano | 2016-08-04 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |