Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | 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 |
* | | | | | | | | | | | Merge branch 'maint' to sync with 1.6.5.7 | Junio C Hamano | 2009-12-16 | 2 | -0/+32 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | worktree: don't segfault with an absolute pathspec without a work tree | Junio C Hamano | 2009-12-16 | 1 | -0/+15 |
| * | | | | | | | | | | ignore unknown color configuration | Jeff King | 2009-12-16 | 1 | -0/+17 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Sync with 1.6.5.6 | Junio C Hamano | 2009-12-10 | 1 | -69/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Remove post-upload-hook | Junio C Hamano | 2009-12-10 | 1 | -69/+0 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-08 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'jk/maint-add-p-delete-fix' into maint | Junio C Hamano | 2009-12-08 | 1 | -0/+20 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| | * | | | | | | | | add-interactive: fix deletion of non-empty files | Jeff King | 2009-12-07 | 1 | -0/+20 |
* | | | | | | | | | | git svn: log removals of empty directories | Eric Wong | 2009-12-07 | 1 | -0/+10 |
* | | | | | | | | | | Sync with 1.6.5.5 | Junio C Hamano | 2009-12-05 | 1 | -3/+29 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | reset: improve worktree safety valves | Jeff King | 2009-12-05 | 1 | -3/+29 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'uk/maint-shortlog-encoding' into maint | Junio C Hamano | 2009-12-03 | 1 | -0/+28 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | t4201: use ISO8859-1 rather than ISO-8859-1 | Brandon Casey | 2009-12-03 | 1 | -2/+2 |
| * | | | | | | | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint | Junio C Hamano | 2009-12-03 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rj/maint-t9700' into maint | Junio C Hamano | 2009-12-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/maint-mailinfo-no-inbody' into maint | Junio C Hamano | 2009-12-03 | 14 | -1/+101 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |