Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/maint-diff-patch-header' | Junio C Hamano | 2012-03-06 | 1 | -85/+110 |
|\ | |||||
| * | diff -p: squelch "diff --git" header for stat-dirty pathsjc/maint-diff-patch-header | Junio C Hamano | 2012-03-01 | 1 | -4/+1 |
| * | t4011: illustrate "diff-index -p" on stat-dirty paths | Junio C Hamano | 2012-03-01 | 1 | -7/+39 |
| * | t4011: modernise style | Junio C Hamano | 2012-03-01 | 1 | -86/+82 |
* | | Merge branch 'cn/pull-rebase-message' | Junio C Hamano | 2012-03-06 | 1 | -4/+2 |
|\ \ | |||||
| * | | Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-message | Carlos Martín Nieto | 2012-03-04 | 1 | -4/+2 |
* | | | Merge branch 'sl/modern-t0000' | Junio C Hamano | 2012-03-06 | 1 | -274/+289 |
|\ \ \ | |||||
| * | | | t0000: modernise stylesl/modern-t0000 | Stefano Lattarini | 2012-03-02 | 1 | -274/+289 |
* | | | | Merge branch 'tr/maint-bundle-boundary' | Junio C Hamano | 2012-03-06 | 1 | -22/+35 |
|\ \ \ \ | |||||
| * | | | | bundle: keep around names passed to add_pending_object()tr/maint-bundle-boundary | Thomas Rast | 2012-03-01 | 1 | -0/+15 |
| * | | | | t5510: ensure we stay in the toplevel test dir | Thomas Rast | 2012-03-01 | 1 | -8/+10 |
| * | | | | t5510: refactor bundle->pack conversion | Thomas Rast | 2012-03-01 | 1 | -14/+10 |
* | | | | | Merge branch 'zj/diff-stat-dyncol' | Junio C Hamano | 2012-03-06 | 1 | -0/+220 |
|\ \ \ \ \ | |||||
| * | | | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncol | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+6 |
| * | | | | | diff --stat: enable limiting of the graph part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+6 |
| * | | | | | diff --stat: add a test for output with COLUMNS=40 | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+19 |
| * | | | | | diff --stat: use a maximum of 5/8 for the filename part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -8/+8 |
| * | | | | | merge --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -4/+4 |
| * | | | | | log --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -2/+2 |
| * | | | | | show --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -2/+2 |
| * | | | | | diff --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -2/+9 |
| * | | | | | diff --stat: tests for long filenames and big change counts | Junio C Hamano | 2012-03-01 | 1 | -0/+182 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-03-06 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5704: fix nonportable sed/grep usages | Thomas Rast | 2012-03-06 | 1 | -2/+2 |
* | | | | | | | perf: compare diff algorithms | Thomas Rast | 2012-03-06 | 1 | -0/+29 |
* | | | | | | | 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 |