Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/am-3-nonstandard-popt' | Junio C Hamano | 2012-03-04 | 1 | -0/+15 |
|\ | |||||
| * | test: "am -3" can accept non-standard -p<num>jc/am-3-nonstandard-popt | Junio C Hamano | 2012-02-26 | 1 | -0/+15 |
* | | Merge branch 'maint' | Junio C Hamano | 2012-03-04 | 3 | -28/+13 |
|\ \ | |||||
| * \ | Merge branch 'cn/maint-branch-with-bad' into maint | Junio C Hamano | 2012-03-04 | 1 | -0/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'jn/maint-gitweb-invalid-regexp' into maint | Junio C Hamano | 2012-03-04 | 1 | -0/+10 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint | Junio C Hamano | 2012-03-04 | 1 | -0/+86 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'tr/maint-bundle-long-subject' into maint | Junio C Hamano | 2012-03-04 | 1 | -24/+23 |
| |\ \ \ \ \ | |||||
| * | | | | | | t0300: work around bug in dash 0.5.6 | Michael J Gruber | 2012-03-02 | 1 | -1/+4 |
| * | | | | | | t5512 (ls-remote): modernize style | Tom Grennan | 2012-03-02 | 1 | -23/+4 |
| * | | | | | | tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh | Stefano Lattarini | 2012-03-02 | 1 | -4/+5 |
| * | | | | | | Merge branch 'jn/gitweb-unborn-head' into maint | Junio C Hamano | 2012-02-27 | 1 | -0/+9 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | parse-options: typo check for unknown switches | René Scharfe | 2012-03-04 | 1 | -0/+10 |
* | | | | | | | | Merge branch 'cb/fsck-squelch-dangling' | Junio C Hamano | 2012-03-01 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-dangling | Junio C Hamano | 2012-02-28 | 1 | -5/+1 |
* | | | | | | | | | Merge branch 'rs/no-no-no-parseopt' | Junio C Hamano | 2012-03-01 | 1 | -2/+58 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | parse-options: allow positivation of options starting, with no- | René Scharfe | 2012-02-26 | 1 | -1/+1 |
| * | | | | | | | | | test-parse-options: convert to OPT_BOOL() | René Scharfe | 2012-02-26 | 1 | -2/+58 |
* | | | | | | | | | | Merge branch 'jn/maint-gitweb-invalid-regexp' | Junio C Hamano | 2012-03-01 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | gitweb: Handle invalid regexp in regexp searchjn/maint-gitweb-invalid-regexp | Jakub Narebski | 2012-02-28 | 1 | -0/+10 |
* | | | | | | | | | | Merge branch 'cn/maint-branch-with-bad' | Junio C Hamano | 2012-03-01 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | branch: don't assume the merge filter ref existscn/maint-branch-with-bad | Carlos Martín Nieto | 2012-02-27 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'ph/cherry-pick-advice-refinement' | Junio C Hamano | 2012-02-28 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | cherry-pick: No advice to commit if --no-commitph/cherry-pick-advice-refinement | Phil Hord | 2012-02-22 | 1 | -0/+14 |
* | | | | | | | | | | | Merge branch 'jb/required-filter' | Junio C Hamano | 2012-02-28 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add a setting to require a filter to be successfuljb/required-filter | Jehan Bing | 2012-02-17 | 1 | -0/+37 |
* | | | | | | | | | | | | git-p4: missing she-bang line in t9804 confuses prove | Zbigniew Jędrzejewski-Szmek | 2012-02-27 | 1 | -0/+2 |
* | | | | | | | | | | | | grep -P: add tests for matching ^ and $ | Michał Kiedrowicz | 2012-02-27 | 1 | -0/+23 |
* | | | | | | | | | | | | Merge branch 'tr/maint-bundle-long-subject' | Junio C Hamano | 2012-02-26 | 1 | -24/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | t5704: match tests to modern styletr/maint-bundle-long-subject | Thomas Rast | 2012-02-23 | 1 | -25/+8 |
| * | | | | | | | | | | | bundle: use a strbuf to scan the log for boundary commits | Thomas Rast | 2012-02-23 | 1 | -0/+16 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fc/push-prune' | Junio C Hamano | 2012-02-26 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | push: add '--prune' optionfc/push-prune | Felipe Contreras | 2012-02-22 | 1 | -0/+16 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/maint-avoid-streaming-filtered-contents' | Junio C Hamano | 2012-02-26 | 1 | -0/+86 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | do not stream large files to pack when filters are in usejk/maint-avoid-streaming-filtered-contents | Jeff King | 2012-02-24 | 1 | -0/+86 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-02-26 | 3 | -21/+174 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'jc/add-refresh-unmerged' into maint | Junio C Hamano | 2012-02-26 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Sync with 1.7.8.5 | Junio C Hamano | 2012-02-26 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | am: don't infloop for an empty input file | Jim Meyering | 2012-02-26 | 1 | -0/+10 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | git-p4: remove bash-ism in t9800 | Pete Wyckoff | 2012-02-26 | 1 | -9/+15 |
| * | | | | | | | | git-p4: remove bash-ism in t9809 | Pete Wyckoff | 2012-02-26 | 1 | -1/+1 |
| * | | | | | | | | git-p4: fix submit regression with clientSpec and subdir clone | Pete Wyckoff | 2012-02-26 | 1 | -11/+131 |
| * | | | | | | | | git-p4: set useClientSpec variable on initial clone | Pete Wyckoff | 2012-02-26 | 1 | -0/+17 |
| * | | | | | | | | Merge branch 'cb/receive-pack-keep-errors' into maint | Junio C Hamano | 2012-02-21 | 1 | -4/+18 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'cb/transfer-no-progress' into maint | Junio C Hamano | 2012-02-21 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/git-dir-lookup' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+100 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-rev-list-verify-object' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-t5541-make-server-port-portable' into maint | Junio C Hamano | 2012-02-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/grep-binary-attribute' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diffstat-gramnum' into maint | Junio C Hamano | 2012-02-21 | 64 | -109/+109 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/git-p4-expanded-keywords' | Junio C Hamano | 2012-02-23 | 1 | -0/+388 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |