Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Be more specific if upstream branch is not tracked | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -3/+3 |
* | Provide better message for barnhc_wiht_tpyo@{u} | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -1/+1 |
* | Provide branch name in error message when using @{u} | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -2/+2 |
* | t1507: add tests to document @{upstream} behaviour | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -3/+78 |
* | tests: unset COLUMNS inherited from environment | Zbigniew Jędrzejewski-Szmek | 2012-03-27 | 1 | -1/+1 |
* | Merge "two fixes for fast-import's 'ls' command" from Jonathan | Junio C Hamano | 2012-03-16 | 1 | -0/+39 |
|\ | |||||
| * | fast-import: don't allow 'ls' of path with empty componentsjn/maint-fast-import-empty-ls | Jonathan Nieder | 2012-03-09 | 1 | -0/+39 |
* | | Merge branch 'jc/maint-undefined-i18n-observation-test' | Junio C Hamano | 2012-03-13 | 1 | -14/+23 |
|\ \ | |||||
| * | | t0204: clarify the "observe undefined behaviour" testjc/maint-undefined-i18n-observation-test | Junio C Hamano | 2012-03-09 | 1 | -14/+23 |
* | | | Merge branch 'ms/maint-config-error-at-eol-linecount' | Junio C Hamano | 2012-03-13 | 1 | -0/+31 |
|\ \ \ | |||||
| * | | | config: report errors at the EOL with correct line numberms/maint-config-error-at-eol-linecount | Martin Stenberg | 2012-03-12 | 1 | -0/+31 |
* | | | | p4000: use -3000 when promising -3000 | Thomas Rast | 2012-03-09 | 1 | -1/+1 |
* | | | | Merge branch 'jl/maint-submodule-relative' | Junio C Hamano | 2012-03-08 | 2 | -0/+39 |
|\ \ \ \ | |||||
| * | | | | submodules: refactor computation of relative gitdir path | Jens Lehmann | 2012-03-04 | 1 | -0/+17 |
| * | | | | submodules: always use a relative path from gitdir to work tree | Jens Lehmann | 2012-03-04 | 1 | -0/+20 |
| * | | | | submodules: always use a relative path to gitdir | Jens Lehmann | 2012-03-04 | 1 | -0/+2 |
* | | | | | perf: export some important test-lib variables | Thomas Rast | 2012-03-08 | 2 | -1/+14 |
* | | | | | perf: load test-lib-functions from the correct directory | Thomas Rast | 2012-03-08 | 2 | -1/+6 |
* | | | | | Merge branch 'jc/pickaxe-ignore-case' | Junio C Hamano | 2012-03-07 | 1 | -0/+119 |
|\ \ \ \ \ | |||||
| * | | | | | pickaxe: allow -i to search in patch case-insensitively | Junio C Hamano | 2012-02-28 | 1 | -0/+119 |
* | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ |