Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | diff --no-index: reset temporary buffer lengths on directory iteration | Bobby Powers | 2012-05-16 | 1 | -0/+19 |
* | Merge branch 'jn/maint-fast-import-empty-ls' into maint | Junio C Hamano | 2012-03-26 | 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 'ms/maint-config-error-at-eol-linecount' into maint | Junio C Hamano | 2012-03-26 | 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 |
* | | | Merge branch 'maint-1.7.8' into maint | Junio C Hamano | 2012-03-20 | 2 | -3/+11 |
|\ \ \ | |||||
| * \ \ | Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8 | Junio C Hamano | 2012-03-20 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | t/Makefile: Use $(sort ...) explicitly where neededks/sort-wildcard-in-makefile | Kirill Smelkov | 2012-01-22 | 1 | -3/+3 |
| * | | | | Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8 | Junio C Hamano | 2012-03-20 | 1 | -0/+8 |
| |\ \ \ \ | |||||
| | * | | | | gitweb: Fix actionless dispatch for non-existent objectsjn/gitweb-unspecified-action | Jakub Narebski | 2012-01-09 | 1 | -0/+8 |
* | | | | | | Merge branch 'tr/maint-bundle-boundary' into maint | Junio C Hamano | 2012-03-12 | 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 'jc/maint-diff-patch-header' into maint | Junio C Hamano | 2012-03-12 | 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 'jc/am-3-nonstandard-popt' into maint | Junio C Hamano | 2012-03-12 | 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 |
* | | | | | | | | | t5704: fix nonportable sed/grep usages | Thomas Rast | 2012-03-06 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'cn/maint-branch-with-bad' into maint | Junio C Hamano | 2012-03-04 | 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 'jn/maint-gitweb-invalid-regexp' into maint | Junio C Hamano | 2012-03-04 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitweb: Handle invalid regexp in regexp searchjn/maint-gitweb-invalid-regexp | Jakub Narebski | 2012-02-28 | 1 | -0/+10 |
* | | | | | | | | | | Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint | Junio C Hamano | 2012-03-04 | 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 'tr/maint-bundle-long-subject' into maint | Junio C Hamano | 2012-03-04 | 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 |
| |/ / / / / / / / | |||||
* | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitweb: Fix "heads" view when there is no current branchjn/gitweb-unborn-head | Jakub Narebski | 2012-02-17 | 1 | -0/+9 |
* | | | | | | | | | | Merge branch 'jc/add-refresh-unmerged' into maint | Junio C Hamano | 2012-02-26 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | refresh_index: do not show unmerged path that is outside pathspecjc/add-refresh-unmerged | Junio C Hamano | 2012-02-17 | 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 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | do not override receive-pack errorscb/receive-pack-keep-errors | Clemens Buchacher | 2012-02-13 | 1 | -4/+18 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'cb/transfer-no-progress' into maint | Junio C Hamano | 2012-02-21 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | push/fetch/clone --no-progress suppresses progress outputcb/transfer-no-progress | Clemens Buchacher | 2012-02-13 | 1 | -1/+2 |
* | | | | | | | | | | | Merge branch 'jk/git-dir-lookup' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+100 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | standardize and improve lookup rules for external local reposjk/git-dir-lookup | Jeff King | 2012-02-02 | 1 | -0/+100 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'cb/maint-rev-list-verify-object' into maint | Junio C Hamano | 2012-02-21 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ |