summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t5509: add basic tests for hideRefslf/ref-is-hidden-namespaceLukas Fleischer2015-11-051-0/+41
* hideRefs: add support for matching full refsLukas Fleischer2015-11-055-16/+52
* upload-pack: strip refs before calling ref_is_hidden()Lukas Fleischer2015-11-051-3/+3
* config.txt: document the semantics of hideRefs with namespacesLukas Fleischer2015-11-051-0/+8
* Sync with maintJunio C Hamano2015-11-030-0/+0
|\
| * Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-031-1/+1
| |\
| * \ Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-033-1/+38
| |\ \
| * \ \ Merge branch 'dt/name-hash-dir-entry-fix' into maintJunio C Hamano2015-11-034-60/+35
| |\ \ \
| * \ \ \ Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-031-16/+33
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-0325-41/+64
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-032-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano2015-11-031-1/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano2015-11-035-17/+42
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-031-1/+55
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-032-11/+66
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-032-0/+24
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-034-23/+62
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-032-8/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-039-103/+118
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-038-12/+209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Tenth batch for 2.7Junio C Hamano2015-11-031-0/+28
* | | | | | | | | | | | | | | | | Merge branch 'rs/daemon-plug-child-leak'Junio C Hamano2015-11-034-6/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | daemon: plug memory leakrs/daemon-plug-child-leakRené Scharfe2015-11-021-0/+1
| * | | | | | | | | | | | | | | | | run-command: factor out child_process_clear()René Scharfe2015-11-023-6/+17
* | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent'Junio C Hamano2015-11-032-14/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parentMax Kirillov2015-10-302-3/+31
| * | | | | | | | | | | | | | | | | | blame: extract find_single_finalMax Kirillov2015-10-301-12/+17
| * | | | | | | | | | | | | | | | | | blame: test to describe use of blame --reverse --first-parentMax Kirillov2015-10-301-0/+36
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/wt-status-detached-branch-fix'Junio C Hamano2015-11-032-35/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | wt-status: use skip_prefix() to get rid of magic string length constantsrs/wt-status-detached-branch-fixRené Scharfe2015-11-011-21/+15
| * | | | | | | | | | | | | | | | | | | wt-status: don't skip a magical number of characters blindlyRené Scharfe2015-11-011-1/+1
| * | | | | | | | | | | | | | | | | | | wt-status: avoid building bogus branch name with detached HEADRené Scharfe2015-11-012-7/+10
| * | | | | | | | | | | | | | | | | | | wt-status: exit early using goto in wt_shortstatus_print_tracking()René Scharfe2015-11-011-8/+5
| * | | | | | | | | | | | | | | | | | | t7060: add test for status --branch on a detached HEADRené Scharfe2015-11-011-0/+14
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs/show-branch-argv-array'Junio C Hamano2015-11-031-16/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | show-branch: use argv_array for default argumentsrs/show-branch-argv-arrayRené Scharfe2015-11-011-16/+8
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/git-gdb'Junio C Hamano2015-11-033-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | test: facilitate debugging Git executables in tests with gdbjs/git-gdbJohannes Schindelin2015-10-303-1/+20
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/initialization-fix-to-add-submodule-odb'Junio C Hamano2015-11-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | add_submodule_odb: initialize alt_odb list earlierjk/initialization-fix-to-add-submodule-odbJeff King2015-10-281-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2015-11-032-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-292-3/+20
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/mailinfo-lib'Junio C Hamano2015-11-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | mailinfo: fix passing wrong address to git_mailinfo_configjc/mailinfo-libNguyễn Thái Ngọc Duy2015-11-011-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-branch'Junio C Hamano2015-11-032-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | ref-filter: fallback on alphabetical comparisonkn/for-each-branchKarthik Nayak2015-10-302-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | Ninth batch for 2.7Junio C Hamano2015-10-301-2/+31
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code'Junio C Hamano2015-10-303-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-293-1/+38
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-10-302-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |