summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* branch: give advice when tracking start-point is missingJeff King2013-04-023-2/+20
* branch: mention start_name in set-upstream error messagesJeff King2013-04-021-5/+5
* branch: improve error message for missing --set-upstream-to refJeff King2013-04-021-1/+6
* branch: factor out "upstream is not a branch" error messagesJeff King2013-04-021-2/+5
* t3200: test --set-upstream-to with bogus refsJeff King2013-04-021-0/+12
* Update draft release notes to 1.8.3Junio C Hamano2013-04-021-0/+11
* Merge branch 'jk/config-with-empty-section'Junio C Hamano2013-04-021-0/+35
|\
| * t1300: document some aesthetic failures of the config editorJeff King2013-03-291-0/+35
* | Merge branch 'js/log-gpg'Junio C Hamano2013-04-021-0/+3
|\ \
| * | log: read gpg settings for signed commit verificationJacob Sarvis2013-03-271-0/+3
* | | Merge branch 'tr/log-tree-optim'Junio C Hamano2013-04-021-3/+10
|\ \ \
| * | | Avoid loading commits twice in log with diffsThomas Rast2013-03-281-3/+10
* | | | Merge branch 'tb/cygwin-shared-repository'Junio C Hamano2013-04-024-3/+36
|\ \ \ \
| * | | | Make core.sharedRepository work under cygwin 1.7Torsten Bögershausen2013-03-254-3/+36
* | | | | Merge branch 'sw/safe-create-leading-dir-race'Junio C Hamano2013-04-021-2/+7
|\ \ \ \ \
| * | | | | safe_create_leading_directories: fix race that could give a false negativeSteven Walter2013-03-261-2/+7
* | | | | | Merge branch 'bk/document-commit-tree-S'Junio C Hamano2013-04-022-2/+7
|\ \ \ \ \ \
| * | | | | | commit-tree: document -S option consistentlyBrad King2013-03-252-2/+7
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/no-more-self-assignment'Junio C Hamano2013-04-022-47/+34
|\ \ \ \ \ \
| * | | | | | match-trees: simplify score_trees() using tree_entry()René Scharfe2013-03-251-40/+28
| * | | | | | submodule: clarify logic in show_submodule_summaryJeff King2013-03-221-7/+6
* | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-011-2/+28
* | | | | | | Merge branch 'maint'Junio C Hamano2013-04-011-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Update draft release notes to 1.8.2.1Junio C Hamano2013-04-011-0/+4
| * | | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano2013-04-012-1/+67
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rr/tests-dedup-test-config' into maintJunio C Hamano2013-04-012-10/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'yd/doc-is-in-asciidoc' into maintJunio C Hamano2013-04-011-0/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'yd/doc-merge-annotated-tag' into maintJunio C Hamano2013-04-012-1/+26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-019-4/+46
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/downcase-u-in-usage' into maintJunio C Hamano2013-04-0125-82/+82
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-threaded-fixes'Junio C Hamano2013-04-011-8/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | index-pack: guard nr_resolved_deltas reads by lockThomas Rast2013-03-191-1/+3
| * | | | | | | | | | | | | | index-pack: protect deepest_delta in multithread codeNguyễn Thái Ngọc Duy2013-03-191-7/+23
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/index-pack-correct-depth-fix'Junio C Hamano2013-04-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | index-pack: always zero-initialize object_entry listJeff King2013-03-201-0/+2
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jn/push-tests'Junio C Hamano2013-04-011-91/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi'Jonathan Nieder2013-03-191-11/+4
| * | | | | | | | | | | | | | push test: simplify check of push resultJonathan Nieder2013-03-191-63/+51
| * | | | | | | | | | | | | | push test: use test_config when appropriateJonathan Nieder2013-03-191-17/+10
* | | | | | | | | | | | | | | Merge branch 'nd/branch-show-rebase-bisect-state'Junio C Hamano2013-04-017-91/+216
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | status, branch: fix the misleading "bisecting" messageNguyễn Thái Ngọc Duy2013-03-234-4/+4
| * | | | | | | | | | | | | | | branch: show more information when HEAD is detachedNguyễn Thái Ngọc Duy2013-03-163-5/+29
| * | | | | | | | | | | | | | | status: show more info than "currently not on any branch"Nguyễn Thái Ngọc Duy2013-03-164-26/+125
| * | | | | | | | | | | | | | | wt-status: move wt_status_get_state() out to wt_status_print()Nguyễn Thái Ngọc Duy2013-03-161-19/+20
| * | | | | | | | | | | | | | | wt-status: split wt_status_state parsing function outNguyễn Thái Ngọc Duy2013-03-162-18/+24
| * | | | | | | | | | | | | | | wt-status: move strbuf into read_and_strip_branch()Nguyễn Thái Ngọc Duy2013-03-162-37/+32
| * | | | | | | | | | | | | | | Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-stateJunio C Hamano2013-03-133-77/+134
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/nobody-sets-src-peer-ref'Junio C Hamano2013-04-011-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | match_push_refs(): nobody sets src->peer_ref anymoreJunio C Hamano2013-03-041-3/+0
* | | | | | | | | | | | | | | | | | Merge branch 'jc/remove-export-from-config-mak-in'Junio C Hamano2013-04-011-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \