Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | branch: give advice when tracking start-point is missing | Jeff King | 2013-04-02 | 3 | -2/+20 |
* | branch: mention start_name in set-upstream error messages | Jeff King | 2013-04-02 | 1 | -5/+5 |
* | branch: improve error message for missing --set-upstream-to ref | Jeff King | 2013-04-02 | 1 | -1/+6 |
* | branch: factor out "upstream is not a branch" error messages | Jeff King | 2013-04-02 | 1 | -2/+5 |
* | t3200: test --set-upstream-to with bogus refs | Jeff King | 2013-04-02 | 1 | -0/+12 |
* | Update draft release notes to 1.8.3 | Junio C Hamano | 2013-04-02 | 1 | -0/+11 |
* | Merge branch 'jk/config-with-empty-section' | Junio C Hamano | 2013-04-02 | 1 | -0/+35 |
|\ | |||||
| * | t1300: document some aesthetic failures of the config editor | Jeff King | 2013-03-29 | 1 | -0/+35 |
* | | Merge branch 'js/log-gpg' | Junio C Hamano | 2013-04-02 | 1 | -0/+3 |
|\ \ | |||||
| * | | log: read gpg settings for signed commit verification | Jacob Sarvis | 2013-03-27 | 1 | -0/+3 |
* | | | Merge branch 'tr/log-tree-optim' | Junio C Hamano | 2013-04-02 | 1 | -3/+10 |
|\ \ \ | |||||
| * | | | Avoid loading commits twice in log with diffs | Thomas Rast | 2013-03-28 | 1 | -3/+10 |
* | | | | Merge branch 'tb/cygwin-shared-repository' | Junio C Hamano | 2013-04-02 | 4 | -3/+36 |
|\ \ \ \ | |||||
| * | | | | Make core.sharedRepository work under cygwin 1.7 | Torsten Bögershausen | 2013-03-25 | 4 | -3/+36 |
* | | | | | Merge branch 'sw/safe-create-leading-dir-race' | Junio C Hamano | 2013-04-02 | 1 | -2/+7 |
|\ \ \ \ \ | |||||
| * | | | | | safe_create_leading_directories: fix race that could give a false negative | Steven Walter | 2013-03-26 | 1 | -2/+7 |
* | | | | | | Merge branch 'bk/document-commit-tree-S' | Junio C Hamano | 2013-04-02 | 2 | -2/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit-tree: document -S option consistently | Brad King | 2013-03-25 | 2 | -2/+7 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/no-more-self-assignment' | Junio C Hamano | 2013-04-02 | 2 | -47/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | match-trees: simplify score_trees() using tree_entry() | René Scharfe | 2013-03-25 | 1 | -40/+28 |
| * | | | | | | submodule: clarify logic in show_submodule_summary | Jeff King | 2013-03-22 | 1 | -7/+6 |
* | | | | | | | Update draft release notes to 1.8.3 | Junio C Hamano | 2013-04-01 | 1 | -2/+28 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-04-01 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update draft release notes to 1.8.2.1 | Junio C Hamano | 2013-04-01 | 1 | -0/+4 |
| * | | | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint | Junio C Hamano | 2013-04-01 | 2 | -1/+67 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rr/tests-dedup-test-config' into maint | Junio C Hamano | 2013-04-01 | 2 | -10/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'yd/doc-is-in-asciidoc' into maint | Junio C Hamano | 2013-04-01 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'yd/doc-merge-annotated-tag' into maint | Junio C Hamano | 2013-04-01 | 2 | -1/+26 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/document-status-u-tradeoff' into maint | Junio C Hamano | 2013-04-01 | 9 | -4/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/downcase-u-in-usage' into maint | Junio C Hamano | 2013-04-01 | 25 | -82/+82 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-threaded-fixes' | Junio C Hamano | 2013-04-01 | 1 | -8/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | index-pack: guard nr_resolved_deltas reads by lock | Thomas Rast | 2013-03-19 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | index-pack: protect deepest_delta in multithread code | Nguyễn Thái Ngọc Duy | 2013-03-19 | 1 | -7/+23 |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'jk/index-pack-correct-depth-fix' | Junio C Hamano | 2013-04-01 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | index-pack: always zero-initialize object_entry list | Jeff King | 2013-03-20 | 1 | -0/+2 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'jn/push-tests' | Junio C Hamano | 2013-04-01 | 1 | -91/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi' | Jonathan Nieder | 2013-03-19 | 1 | -11/+4 |
| * | | | | | | | | | | | | | | push test: simplify check of push result | Jonathan Nieder | 2013-03-19 | 1 | -63/+51 |
| * | | | | | | | | | | | | | | push test: use test_config when appropriate | Jonathan Nieder | 2013-03-19 | 1 | -17/+10 |
* | | | | | | | | | | | | | | | Merge branch 'nd/branch-show-rebase-bisect-state' | Junio C Hamano | 2013-04-01 | 7 | -91/+216 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | status, branch: fix the misleading "bisecting" message | Nguyễn Thái Ngọc Duy | 2013-03-23 | 4 | -4/+4 |
| * | | | | | | | | | | | | | | | branch: show more information when HEAD is detached | Nguyễn Thái Ngọc Duy | 2013-03-16 | 3 | -5/+29 |
| * | | | | | | | | | | | | | | | status: show more info than "currently not on any branch" | Nguyễn Thái Ngọc Duy | 2013-03-16 | 4 | -26/+125 |
| * | | | | | | | | | | | | | | | wt-status: move wt_status_get_state() out to wt_status_print() | Nguyễn Thái Ngọc Duy | 2013-03-16 | 1 | -19/+20 |
| * | | | | | | | | | | | | | | | wt-status: split wt_status_state parsing function out | Nguyễn Thái Ngọc Duy | 2013-03-16 | 2 | -18/+24 |
| * | | | | | | | | | | | | | | | wt-status: move strbuf into read_and_strip_branch() | Nguyễn Thái Ngọc Duy | 2013-03-16 | 2 | -37/+32 |
| * | | | | | | | | | | | | | | | Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state | Junio C Hamano | 2013-03-13 | 3 | -77/+134 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/nobody-sets-src-peer-ref' | Junio C Hamano | 2013-04-01 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | match_push_refs(): nobody sets src->peer_ref anymore | Junio C Hamano | 2013-03-04 | 1 | -3/+0 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/remove-export-from-config-mak-in' | Junio C Hamano | 2013-04-01 | 1 | -6/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |