Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-02-10 | 1 | -2/+4 |
|\ | |||||
| * | t8003: check exit code of command and error message separately | Junio C Hamano | 2010-02-10 | 1 | -2/+4 |
* | | Merge branch 'sp/maint-fast-import-large-blob' into maint | Junio C Hamano | 2010-02-10 | 2 | -1/+47 |
|\ \ | |||||
| * | | fast-import: Stream very large blobs directly to pack | Shawn O. Pearce | 2010-02-01 | 2 | -1/+47 |
* | | | Merge branch 'jc/maint-reflog-bad-timestamp' into maint | Junio C Hamano | 2010-02-10 | 1 | -0/+45 |
|\ \ \ | |||||
| * | | | t0101: use a fixed timestamp when searching in the reflog | Junio C Hamano | 2010-01-27 | 1 | -2/+2 |
| * | | | approxidate_careful() reports errorneous date string | Junio C Hamano | 2010-01-26 | 1 | -0/+45 |
* | | | | Merge branch 'jh/maint-config-file-prefix' into maint | Junio C Hamano | 2010-02-10 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * | | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dir | Johan Herland | 2010-01-26 | 1 | -0/+11 |
* | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint | Junio C Hamano | 2010-02-10 | 1 | -0/+57 |
|\ \ \ \ \ | |||||
| * | | | | | checkout -m path: fix recreating conflicts | Junio C Hamano | 2010-01-06 | 1 | -0/+57 |
* | | | | | | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-02-08 | 1 | -0/+8 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | blame: prevent a segv when -L given start > EOF | Jay Soffian | 2010-02-08 | 1 | -0/+8 |
| * | | | | | Merge branch 'sb/maint-octopus' into maint-1.6.5 | Junio C Hamano | 2010-02-01 | 1 | -0/+51 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
* | | | | | | archive: simplify archive format guessing | René Scharfe | 2010-02-07 | 1 | -0/+10 |
* | | | | | | Merge branch 'jc/maint-limit-note-output' into maint | Junio C Hamano | 2010-02-05 | 1 | -0/+59 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix "log --oneline" not to show notes | Junio C Hamano | 2010-01-21 | 1 | -2/+4 |
| * | | | | | Fix "log" family not to be too agressive about showing notes | Junio C Hamano | 2010-01-20 | 1 | -0/+57 |
* | | | | | | ignore duplicated slashes in make_relative_path() | Junio C Hamano | 2010-01-22 | 1 | -0/+6 |
|/ / / / / | |||||
* | | | | | Merge branch 'bg/maint-remote-update-default' into maint | Junio C Hamano | 2010-01-20 | 1 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Fix "git remote update" with remotes.defalt set | Björn Gustavsson | 2009-12-31 | 1 | -0/+14 |
* | | | | | | Merge branch 'sb/maint-octopus' into maint | Junio C Hamano | 2010-01-20 | 1 | -0/+51 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | octopus: reenable fast-forward merges | Stephen Boyd | 2009-12-13 | 1 | -0/+18 |
| * | | | | | octopus: make merge process simpler to follow | Stephen Boyd | 2009-12-13 | 1 | -0/+33 |
* | | | | | | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-01-20 | 1 | -0/+6 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5 | Junio C Hamano | 2010-01-20 | 1 | -0/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | reset: unbreak hard resets with GIT_WORK_TREE | Jeff King | 2009-12-30 | 1 | -0/+6 |
| * | | | | | | Merge branch 'maint-1.6.4' into maint-1.6.5 | Junio C Hamano | 2010-01-18 | 2 | -20/+20 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'maint-1.6.3' into maint-1.6.4 | Junio C Hamano | 2010-01-18 | 2 | -20/+20 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'maint-1.6.2' into maint-1.6.3 | Junio C Hamano | 2010-01-18 | 2 | -20/+20 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2010-01-10 | 2 | -20/+20 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2010-01-10 | 1 | -13/+13 |
| | | | | |\ \ \ \ \ \ | |||||
| | * | | | \ \ \ \ \ \ | Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4 | Junio C Hamano | 2010-01-18 | 1 | -1/+5 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fix mis-backport of t7002 | Junio C Hamano | 2010-01-18 | 1 | -1/+5 |
* | | | | | | | | | | | | | remote-curl: Fix Accept header for smart HTTP connections | Shawn O. Pearce | 2010-01-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-12-31 | 1 | -13/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | branch: die explicitly why when calling "git branch [-a|-r] branchname". | Matthieu Moy | 2009-12-31 | 1 | -13/+13 |
* | | | | | | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-12-30 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-12-29 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | t7102: make the test fail if one of its check fails | Nguyễn Thái Ngọc Duy | 2009-12-29 | 1 | -7/+7 |
* | | | | | | | | | | | | | t4019 "grep" portability fix | Junio C Hamano | 2009-12-26 | 1 | -28/+28 |
* | | | | | | | | | | | | | t1200: work around a bug in some implementations of "find" | Junio C Hamano | 2009-12-26 | 1 | -1/+1 |
* | | | | | | | | | | | | | git svn: add test for a git svn gc followed by a git svn mkdirs | Robert Zeh | 2009-12-23 | 1 | -0/+40 |
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-22 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Prevent git blame from segfaulting on a missing author name | David Reiss | 2009-12-22 | 1 | -0/+13 |
* | | | | | | | | | | | | | git-svn: detect cherry-picks correctly. | Sam Vilain | 2009-12-21 | 1 | -2/+2 |
* | | | | | | | | | | | | | git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges | Sam Vilain | 2009-12-21 | 1 | -1/+1 |
* | | | | | | | | | | | | | git-svn: expand the svn mergeinfo test suite, highlighting some failures | Sam Vilain | 2009-12-21 | 3 | -172/+860 |
* | | | | | | | | | | | | | t9146: use 'svn_cmd' wrapper | Eric Wong | 2009-12-19 | 1 | -1/+1 |
* | | | | | | | | | | | | | git svn: make empty directory creation gc-aware | Eric Wong | 2009-12-19 | 1 | -0/+24 |