Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-1.6.5-reset-hard' | Junio C Hamano | 2010-01-10 | 1 | -0/+6 |
|\ | |||||
| * | reset: unbreak hard resets with GIT_WORK_TREE | Jeff King | 2009-12-30 | 1 | -0/+6 |
* | | Merge branch 'jk/push-to-delete' | Junio C Hamano | 2010-01-10 | 1 | -0/+26 |
|\ \ | |||||
| * | | builtin-push: add --delete as syntactic sugar for :foo | Jan Krüger | 2009-12-30 | 1 | -0/+26 |
* | | | Merge branch 'mm/config-path' | Junio C Hamano | 2010-01-10 | 1 | -0/+28 |
|\ \ \ | |||||
| * | | | builtin-config: add --path option doing ~ and ~user expansion. | Matthieu Moy | 2009-12-31 | 1 | -0/+28 |
| |/ / | |||||
* | | | Merge branch 'bg/maint-remote-update-default' | Junio C Hamano | 2010-01-10 | 1 | -0/+14 |
|\ \ \ | |||||
| * | | | Fix "git remote update" with remotes.defalt set | Björn Gustavsson | 2009-12-31 | 1 | -0/+14 |
* | | | | Merge branch 'mm/diag-path-in-treeish' | Junio C Hamano | 2010-01-10 | 1 | -0/+69 |
|\ \ \ \ | |||||
| * | | | | Detailed diagnosis when parsing an object name fails. | Matthieu Moy | 2009-12-07 | 1 | -0/+69 |
* | | | | | Merge branch 'sb/maint-octopus' | Junio C Hamano | 2010-01-07 | 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 'mv/commit-date' | Junio C Hamano | 2010-01-07 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin-commit: add --date option | Miklos Vajna | 2009-12-03 | 1 | -0/+15 |
* | | | | | | | Merge branch 'mo/bin-wrappers' | Junio C Hamano | 2010-01-07 | 2 | -12/+30 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | run test suite without dashed git-commands in PATH | Matthew Ogilvie | 2009-12-03 | 2 | -12/+30 |
* | | | | | | | | Use warning function instead of fprintf(stderr, "Warning: ..."). | Thiago Farina | 2010-01-03 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-31 | 1 | -13/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | 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' | Junio C Hamano | 2009-12-30 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | 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 |
* | | | | | | | | | | | Merge branch 'jk/1.7.0-status' | Junio C Hamano | 2009-12-27 | 6 | -53/+351 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | status/commit: do not suggest "reset HEAD <path>" while merging | Junio C Hamano | 2009-12-12 | 1 | -1/+0 |
| * | | | | | | | | | | | commit/status: "git add <path>" is not necessarily how to resolve | Junio C Hamano | 2009-12-12 | 1 | -1/+1 |
| * | | | | | | | | | | | t7508-status: test all modes with color | Michael J Gruber | 2009-12-08 | 3 | -44/+156 |
| * | | | | | | | | | | | t7508-status: status --porcelain ignores relative paths setting | Michael J Gruber | 2009-12-08 | 1 | -0/+18 |
| * | | | | | | | | | | | t7508-status.sh: Add tests for status -s | Michael J Gruber | 2009-11-27 | 1 | -0/+166 |
| * | | | | | | | | | | | git status: not "commit --dry-run" anymore | Junio C Hamano | 2009-08-22 | 4 | -12/+16 |
* | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-26 | 2 | -29/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'gb/1.7.0-diff-whitespace-only-output' | Junio C Hamano | 2009-12-26 | 1 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | No diff -b/-w output for all-whitespace changes | Greg Bacon | 2009-11-20 | 1 | -2/+12 |
* | | | | | | | | | | | | Merge branch 'jc/1.7.0-diff-whitespace-only-status' | Junio C Hamano | 2009-12-26 | 1 | -0/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Make test case number unique | Johannes Sixt | 2009-08-27 | 1 | -0/+0 |
| * | | | | | | | | | | | | diff: change semantics of "ignore whitespace" options | Junio C Hamano | 2009-07-29 | 1 | -0/+63 |
* | | | | | | | | | | | | | Merge branch 'jc/1.7.0-push-safety' | Junio C Hamano | 2009-12-26 | 7 | -17/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Refuse deleting the current branch via push | Junio C Hamano | 2009-07-29 | 1 | -7/+2 |
| * | | | | | | | | | | | | | Refuse updating the current branch in a non-bare repository via push | Junio C Hamano | 2009-07-29 | 7 | -10/+23 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'sr/vcs-helper' | Junio C Hamano | 2009-12-26 | 1 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | tests: handle NO_PYTHON setting | Jeff King | 2009-12-07 | 1 | -3/+3 |
| * | | | | | | | | | | | | Add Python support library for remote helpers | Sverre Rabbelier | 2009-11-24 | 1 | -0/+9 |
| * | | | | | | | | | | | | Basic build infrastructure for Python scripts | Johan Herland | 2009-11-17 | 1 | -0/+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 |