Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t5509: add basic tests for hideRefslf/ref-is-hidden-namespace | Lukas Fleischer | 2015-11-05 | 1 | -0/+41 |
* | hideRefs: add support for matching full refs | Lukas Fleischer | 2015-11-05 | 5 | -16/+52 |
* | upload-pack: strip refs before calling ref_is_hidden() | Lukas Fleischer | 2015-11-05 | 1 | -3/+3 |
* | config.txt: document the semantics of hideRefs with namespaces | Lukas Fleischer | 2015-11-05 | 1 | -0/+8 |
* | Sync with maint | Junio C Hamano | 2015-11-03 | 0 | -0/+0 |
|\ | |||||
| * | Merge branch 'mk/blame-error-message' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-03 | 3 | -1/+38 |
| |\ \ | |||||
| * \ \ | Merge branch 'dt/name-hash-dir-entry-fix' into maint | Junio C Hamano | 2015-11-03 | 4 | -60/+35 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/am-3-fallback-regression-fix' into maint | Junio C Hamano | 2015-11-03 | 1 | -16/+33 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/usage-stdin' into maint | Junio C Hamano | 2015-11-03 | 25 | -41/+64 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rt/placeholder-in-usage' into maint | Junio C Hamano | 2015-11-03 | 2 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dt/t7063-fix-flaky-test' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'mk/submodule-gitdir-path' into maint | Junio C Hamano | 2015-11-03 | 5 | -17/+42 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/gc-auto-background-fix' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+55 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-translation-failure' into maint | Junio C Hamano | 2015-11-03 | 2 | -11/+66 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-11-03 | 2 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/clone-dissociate' into maint | Junio C Hamano | 2015-11-03 | 4 | -23/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/p4-import-labels' into maint | Junio C Hamano | 2015-11-03 | 2 | -8/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tk/stripspace' into maint | Junio C Hamano | 2015-11-03 | 9 | -103/+118 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-03 | 8 | -12/+209 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | Tenth batch for 2.7 | Junio C Hamano | 2015-11-03 | 1 | -0/+28 |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/daemon-plug-child-leak' | Junio C Hamano | 2015-11-03 | 4 | -6/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | daemon: plug memory leakrs/daemon-plug-child-leak | René Scharfe | 2015-11-02 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | run-command: factor out child_process_clear() | René Scharfe | 2015-11-02 | 3 | -6/+17 |
* | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent' | Junio C Hamano | 2015-11-03 | 2 | -14/+83 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parent | Max Kirillov | 2015-10-30 | 2 | -3/+31 |
| * | | | | | | | | | | | | | | | | | | blame: extract find_single_final | Max Kirillov | 2015-10-30 | 1 | -12/+17 |
| * | | | | | | | | | | | | | | | | | | 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-03 | 2 | -35/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | wt-status: use skip_prefix() to get rid of magic string length constantsrs/wt-status-detached-branch-fix | René Scharfe | 2015-11-01 | 1 | -21/+15 |
| * | | | | | | | | | | | | | | | | | | | wt-status: don't skip a magical number of characters blindly | René Scharfe | 2015-11-01 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | wt-status: avoid building bogus branch name with detached HEAD | René Scharfe | 2015-11-01 | 2 | -7/+10 |
| * | | | | | | | | | | | | | | | | | | | wt-status: exit early using goto in wt_shortstatus_print_tracking() | René Scharfe | 2015-11-01 | 1 | -8/+5 |
| * | | | | | | | | | | | | | | | | | | | t7060: add test for status --branch on a detached HEAD | René Scharfe | 2015-11-01 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/show-branch-argv-array' | Junio C Hamano | 2015-11-03 | 1 | -16/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | show-branch: use argv_array for default argumentsrs/show-branch-argv-array | René Scharfe | 2015-11-01 | 1 | -16/+8 |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'js/git-gdb' | Junio C Hamano | 2015-11-03 | 3 | -1/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | test: facilitate debugging Git executables in tests with gdbjs/git-gdb | Johannes Schindelin | 2015-10-30 | 3 | -1/+20 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/initialization-fix-to-add-submodule-odb' | Junio C Hamano | 2015-11-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | add_submodule_odb: initialize alt_odb list earlierjk/initialization-fix-to-add-submodule-odb | Jeff King | 2015-10-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2015-11-03 | 2 | -3/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | difftool: ignore symbolic links in use_wt_file | David Aguilar | 2015-10-29 | 2 | -3/+20 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/mailinfo-lib' | Junio C Hamano | 2015-11-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | mailinfo: fix passing wrong address to git_mailinfo_configjc/mailinfo-lib | Nguyễn Thái Ngọc Duy | 2015-11-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-branch' | Junio C Hamano | 2015-11-03 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | ref-filter: fallback on alphabetical comparisonkn/for-each-branch | Karthik Nayak | 2015-10-30 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Ninth batch for 2.7 | Junio C Hamano | 2015-10-30 | 1 | -2/+31 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code' | Junio C Hamano | 2015-10-30 | 3 | -1/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-code | Jeff King | 2015-10-29 | 3 | -1/+38 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-10-30 | 2 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |