Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2009-01-14 |
|\ | |||
| * | Update draft release notes to 1.6.1.1 | Junio C Hamano | 2009-01-14 |
| * | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-14 |
| |\ | |||
| | * | fix handling of multiple untracked files for git mv -k | Michael J Gruber | 2009-01-14 |
| | * | add test cases for "git mv -k" | Michael J Gruber | 2009-01-14 |
| * | | Make t3411 executable | Miklos Vajna | 2009-01-14 |
* | | | Update 1.6.2 draft release notes | Junio C Hamano | 2009-01-13 |
* | | | Merge branch 'maint' | Junio C Hamano | 2009-01-13 |
|\ \ \ | |/ / | |||
| * | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-13 |
| |\ \ | | |/ | |||
| | * | fast-import: Cleanup mode setting. | Felipe Contreras | 2009-01-13 |
| | * | Git.pm: call Error::Simple() properly | Jay Soffian | 2009-01-13 |
* | | | Merge branch 'nd/grep-assume-unchanged' | Junio C Hamano | 2009-01-13 |
|\ \ \ | |||
| * | | | grep: grep cache entries if they are "assume unchanged" | Nguyễn Thái Ngọc Duy | 2008-12-27 |
| * | | | grep: support --no-ext-grep to test builtin grep | Nguyễn Thái Ngọc Duy | 2008-12-27 |
* | | | | Merge branch 'as/maint-shortlog-cleanup' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ | |||
| * | | | | builtin-shortlog.c: use string_list_append(), and don't strdup unnecessarily | Adeodato Simó | 2009-01-01 |
| |/ / / | |||
* | | | | Merge branch 'jc/maint-ls-tree' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ | |||
| * | | | | Document git-ls-tree --full-tree | Nanako Shiraishi | 2009-01-01 |
| * | | | | ls-tree: add --full-tree option | Junio C Hamano | 2008-12-26 |
| |/ / / | |||
* | | | | Merge branch 'js/bundle-tags' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ | |||
| * | | | | bundle: allow rev-list options to exclude annotated tags | Johannes Schindelin | 2009-01-05 |
* | | | | | Merge branch 'js/add-not-submodule' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ | |||
| * | | | | | git add: do not add files from a submodule | Johannes Schindelin | 2009-01-05 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'pb/maint-git-pm-false-dir' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ | |||
| * | | | | | Git.pm: correctly handle directory name that evaluates to "false" | Philippe Bruhat (BooK) | 2009-01-01 |
* | | | | | | Merge branch 'pj/maint-ldflags' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ \ | |||
| * | | | | | | configure clobbers LDFLAGS | Paul Jarc | 2009-01-05 |
* | | | | | | | Merge branch 'fe/cvsserver' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | cvsserver: change generation of CVS author names | Fabian Emmes | 2009-01-05 |
| * | | | | | | | cvsserver: add option to configure commit message | Fabian Emmes | 2009-01-03 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'js/maint-bisect-gitk' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | bisect view: call gitk if Cygwin's SESSIONNAME variable is set | Johannes Schindelin | 2009-01-03 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'np/no-loosen-prune-expire-now' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | objects to be pruned immediately don't have to be loosened | Nicolas Pitre | 2009-01-01 |
* | | | | | | | | Merge branch 'cb/maint-unpack-trees-absense' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | unpack-trees: remove redundant path search in verify_absent | Clemens Buchacher | 2009-01-05 |
| * | | | | | | | | unpack-trees: fix path search bug in verify_absent | Clemens Buchacher | 2009-01-05 |
| * | | | | | | | | unpack-trees: handle failure in verify_absent | Clemens Buchacher | 2009-01-05 |
* | | | | | | | | | Merge branch 'mc/cd-p-pwd' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X | Marcel M. Cary | 2009-01-05 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'mh/cherry-default' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Documentation: clarify which parameters are optional to git-cherry | Markus Heidelberg | 2009-01-05 |
| * | | | | | | | | | git-cherry: make <upstream> parameter optional | Markus Heidelberg | 2009-01-01 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||
| * | | | | | | | | Merge branch 'kk/maint-http-push' into maint | Junio C Hamano | 2009-01-13 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint | Junio C Hamano | 2009-01-13 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-merge-recursive-fix' into maint | Junio C Hamano | 2009-01-13 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/maint-apply-modefix' into maint | Junio C Hamano | 2009-01-13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | Avoid spurious error messages on error mistakes. | Pierre Habouzit | 2009-01-13 |