Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t: replace pulls with merges | Felipe Contreras | 2013-10-31 | 4 | -4/+4 |
* | Merge branch 'tr/valgrind-test-fix' | Junio C Hamano | 2013-10-30 | 1 | -99/+34 |
|\ | |||||
| * | Revert "test-lib: allow prefixing a custom string before "ok N" etc."tr/valgrind-test-fix | Thomas Rast | 2013-10-22 | 1 | -15/+12 |
| * | Revert "test-lib: support running tests under valgrind in parallel" | Thomas Rast | 2013-10-22 | 1 | -84/+22 |
* | | Merge branch 'nd/magic-pathspec' | Junio C Hamano | 2013-10-30 | 1 | -0/+15 |
|\ \ | |||||
| * | | Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags | Nguyễn Thái Ngọc Duy | 2013-10-22 | 1 | -0/+15 |
* | | | Merge branch 'nd/gc-lock-against-each-other' | Junio C Hamano | 2013-10-30 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | gc: remove gc.pid file at end of executionnd/gc-lock-against-each-other | Jonathan Nieder | 2013-10-18 | 1 | -0/+5 |
* | | | | Merge branch 'mm/checkout-auto-track-fix' | Junio C Hamano | 2013-10-30 | 2 | -0/+27 |
|\ \ \ \ | |||||
| * | | | | checkout: proper error message on 'git checkout foo bar --'mm/checkout-auto-track-fix | Matthieu Moy | 2013-10-18 | 1 | -0/+6 |
| * | | | | checkout: allow dwim for branch creation for "git checkout $branch --" | Matthieu Moy | 2013-10-18 | 1 | -0/+21 |
* | | | | | Merge branch 'sg/t3600-nul-sha1-fix' | Junio C Hamano | 2013-10-30 | 1 | -7/+4 |
|\ \ \ \ \ | |||||
| * | | | | | t3600: fix broken "choking git rm" testsg/t3600-nul-sha1-fix | SZEDER Gábor | 2013-10-16 | 1 | -7/+4 |
* | | | | | | Merge branch 'jc/upload-pack-send-symref' | Junio C Hamano | 2013-10-30 | 3 | -14/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5570: Update for clone-progress-to-stderr branchjc/upload-pack-send-symref | Brian Gernhardt | 2013-10-22 | 1 | -2/+1 |
| * | | | | | | Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref | Junio C Hamano | 2013-10-22 | 3 | -5/+11 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | t5570: Update for symref capability | Brian Gernhardt | 2013-10-22 | 1 | -1/+1 |
| * | | | | | | | clone: test the new HEAD detection logic | Junio C Hamano | 2013-09-17 | 1 | -0/+11 |
| * | | | | | | | connect: annotate refs with their symref information in get_remote_head() | Junio C Hamano | 2013-09-17 | 1 | -11/+4 |
| * | | | | | | | t5505: fix "set-head --auto with ambiguous HEAD" test | Junio C Hamano | 2013-09-17 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'jk/http-auth-redirects' | Junio C Hamano | 2013-10-30 | 3 | -1/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remote-curl: rewrite base url from info/refs redirects | Jeff King | 2013-10-14 | 3 | -1/+15 |
* | | | | | | | | | Sync with v1.8.4.2 | Junio C Hamano | 2013-10-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/clone-progress-to-stderr' into maint | Junio C Hamano | 2013-10-28 | 3 | -5/+11 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'jk/format-patch-from' into maint | Junio C Hamano | 2013-10-28 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/shortlog-tolerate-broken-commit' into maint | Junio C Hamano | 2013-10-28 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | test-lib: fix typo in comment | Torstein Hegge | 2013-10-28 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge branch 'jc/ls-files-killed-optim' into maint | Junio C Hamano | 2013-10-23 | 1 | -8/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/checkout-auto-tracking' into maint | Junio C Hamano | 2013-10-23 | 2 | -4/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/fetch-into-shallow' into maint | Junio C Hamano | 2013-10-23 | 2 | -3/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'jk/split-broken-ident' | Junio C Hamano | 2013-10-28 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | split_ident: parse timestamp from end of linejk/split-broken-ident | Jeff King | 2013-10-15 | 1 | -2/+7 |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'jc/revision-range-unpeel' | Junio C Hamano | 2013-10-28 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | revision: do not peel tags used in range notation | Junio C Hamano | 2013-10-15 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | Merge branch 'jx/relative-path-regression-fix' | Junio C Hamano | 2013-10-28 | 1 | -28/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | relative_path should honor dos-drive-prefix | Jiang Xin | 2013-10-14 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | | test: use unambigous leading path (/foo) for MSYS | Jiang Xin | 2013-10-14 | 1 | -28/+28 |
* | | | | | | | | | | | | | | | | Merge branch 'hu/cherry-pick-previous-branch' | Junio C Hamano | 2013-10-23 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | cherry-pick: handle "-" after parsing optionshu/cherry-pick-previous-branch | Jeff King | 2013-10-10 | 1 | -0/+12 |
* | | | | | | | | | | | | | | | | | Merge branch 'mg/more-textconv' | Junio C Hamano | 2013-10-23 | 3 | -15/+60 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | grep: honor --textconv for the case rev:pathmg/more-textconv | Michael J Gruber | 2013-05-10 | 1 | -5/+1 |
| * | | | | | | | | | | | | | | | | | grep: allow to use textconv filters | Jeff King | 2013-05-10 | 1 | -1/+5 |
| * | | | | | | | | | | | | | | | | | t7008: demonstrate behavior of grep with textconv | Michael J Gruber | 2013-05-10 | 1 | -0/+31 |
| * | | | | | | | | | | | | | | | | | cat-file: do not die on --textconv without textconv filters | Michael J Gruber | 2013-05-10 | 1 | -15/+5 |
| * | | | | | | | | | | | | | | | | | show: honor --textconv for blobs | Michael J Gruber | 2013-05-10 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | t4030: demonstrate behavior of show with textconv | Michael J Gruber | 2013-05-10 | 1 | -0/+24 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/clone-progress-to-stderr' | Junio C Hamano | 2013-10-18 | 3 | -5/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | clone: always set transport optionsjk/clone-progress-to-stderr | Jeff King | 2013-09-18 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | | | | clone: treat "checking connectivity" like other progress | Jeff King | 2013-09-18 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | clone: send diagnostic messages to stderr | Jeff King | 2013-09-18 | 2 | -5/+6 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |