Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | git-p4: work with a detached head | Luke Diamand | 2015-11-24 | 1 | -1/+1 | |
| | * | | | | | | | | | | | git-p4: add failing test for submit from detached head | Luke Diamand | 2015-11-24 | 1 | -0/+16 | |
| * | | | | | | | | | | | | Merge branch 'sg/filter-branch-dwim-ambiguity' into maint | Jeff King | 2015-12-01 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | filter-branch: deal with object name vs. pathname ambiguity in tree-filter | SZEDER Gábor | 2015-11-25 | 1 | -0/+7 | |
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'dk/t5813-unc-paths' into maint | Jeff King | 2015-12-01 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | t5813: avoid creating urls that break on cygwin | Dennis Kaarsemaker | 2015-11-20 | 1 | -2/+2 | |
| | |/ / / / / / / / / / / | ||||||
| * / / / / / / / / / / / | allow hooks to ignore their standard input stream | Clemens Buchacher | 2015-11-16 | 1 | -18/+15 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge branch 'rs/wt-status-detached-branch-fix' into maint | Junio C Hamano | 2015-11-05 | 1 | -0/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/add-u-A-default-to-top' into maint | Junio C Hamano | 2015-11-05 | 2 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/delete-modechange-conflict' into maint | Junio C Hamano | 2015-11-05 | 3 | -87/+130 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/clone-linked-checkout' into maint | Junio C Hamano | 2015-11-05 | 2 | -0/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-04 | 1 | -0/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/t7063-fix-flaky-test' into maint | Junio C Hamano | 2015-11-04 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mk/submodule-gitdir-path' into maint | Junio C Hamano | 2015-11-04 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-translation-failure' into maint | Junio C Hamano | 2015-11-04 | 1 | -0/+50 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-11-04 | 1 | -0/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/clone-dissociate' into maint | Junio C Hamano | 2015-11-04 | 1 | -0/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/p4-import-labels' into maint | Junio C Hamano | 2015-11-04 | 1 | -0/+45 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-04 | 1 | -0/+60 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/gc-with-stale-symref' into maint | Junio C Hamano | 2015-10-21 | 1 | -0/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-10-21 | 1 | -0/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/worktree-add-cleanup' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/fsck-dropped-errors' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/http-flaky-test-fix' into maint | Junio C Hamano | 2015-10-16 | 3 | -23/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/perf-without-installed-git' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/detach-at-HEAD-reflog' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-dwim-doc' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/connect-clear-env' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/blame-first-parent' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lf/ref-is-hidden-namespace' | Jeff King | 2015-11-20 | 1 | -0/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5509: add basic tests for hideRefs | Lukas Fleischer | 2015-11-05 | 1 | -0/+41 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dk/gc-idx-wo-pack' | Jeff King | 2015-11-20 | 1 | -0/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gc: remove garbage .idx files from pack dir | Doug Kelly | 2015-11-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5304: test cleaning pack garbage | Doug Kelly | 2015-11-04 | 1 | -0/+21 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent' | Junio C Hamano | 2015-11-04 | 1 | -0/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: allow blame --reverse --first-parent when it makes sense | Max Kirillov | 2015-10-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: test to describe use of blame --reverse --first-parent | Max Kirillov | 2015-10-30 | 1 | -0/+36 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/wt-status-detached-branch-fix' | Junio C Hamano | 2015-11-04 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status: avoid building bogus branch name with detached HEAD | René Scharfe | 2015-11-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7060: add test for status --branch on a detached HEAD | René Scharfe | 2015-11-01 | 1 | -0/+14 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/git-gdb' | Junio C Hamano | 2015-11-04 | 2 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test: facilitate debugging Git executables in tests with gdb | Johannes Schindelin | 2015-10-30 | 2 | -0/+13 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2015-11-04 | 1 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: ignore symbolic links in use_wt_file | David Aguilar | 2015-10-29 | 1 | -0/+19 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-branch' | Junio C Hamano | 2015-11-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref-filter: fallback on alphabetical comparison | Karthik Nayak | 2015-10-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code' | Junio C Hamano | 2015-10-30 | 1 | -0/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-file: clamp exit code to maximum 127 | Jeff King | 2015-10-29 | 1 | -0/+33 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-10-30 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |