Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef | Johan Herland | 2010-02-13 |
* | Merge branch 'jc/maint-limit-note-output' | Junio C Hamano | 2010-01-22 |
|\ | |||
| * | Fix "log --oneline" not to show notes | Junio C Hamano | 2010-01-21 |
| * | Fix "log" family not to be too agressive about showing notes | Junio C Hamano | 2010-01-20 |
| * | Merge branch 'bg/maint-remote-update-default' into maint | Junio C Hamano | 2010-01-20 |
| |\ | |||
| * \ | Merge branch 'sb/maint-octopus' into maint | Junio C Hamano | 2010-01-20 |
| |\ \ | |||
| * \ \ | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-01-20 |
| |\ \ \ | |||
| | * \ \ | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5 | Junio C Hamano | 2010-01-20 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'maint-1.6.4' into maint-1.6.5 | Junio C Hamano | 2010-01-18 |
| | |\ \ \ \ | |||
| | | * \ \ \ | Merge branch 'maint-1.6.3' into maint-1.6.4 | Junio C Hamano | 2010-01-18 |
| | | |\ \ \ \ | |||
| | | | * \ \ \ | Merge branch 'maint-1.6.2' into maint-1.6.3 | Junio C Hamano | 2010-01-18 |
| | | | |\ \ \ \ | |||
| | | | | * \ \ \ | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2010-01-10 |
| | | | | |\ \ \ \ | |||
| | | | | | * \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2010-01-10 |
| | | | | | |\ \ \ \ | |||
| | | * | | | \ \ \ \ | Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4 | Junio C Hamano | 2010-01-18 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | Fix mis-backport of t7002 | Junio C Hamano | 2010-01-18 |
* | | | | | | | | | | | | git-mv: fix moving more than one source to a single destination | Junio C Hamano | 2010-01-22 |
* | | | | | | | | | | | | rebase -i: Enclose sed command substitution in quotes | Michael Haggerty | 2010-01-22 |
* | | | | | | | | | | | | Make 'rerere forget' work from a subdirectory. | Johannes Sixt | 2010-01-21 |
* | | | | | | | | | | | | Make test case numbers unique | Johannes Sixt | 2010-01-21 |
* | | | | | | | | | | | | conflict-marker-size: add test and docs | Junio C Hamano | 2010-01-20 |
* | | | | | | | | | | | | Merge branch 'ag/patch-header-verify' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | builtin-apply.c: fix the --- and +++ header filename consistency check | Andreas Gruenbacher | 2010-01-18 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'ag/maint-apply-too-large-p' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | builtin-apply.c: Skip filenames without enough components | Andreas Gruenbacher | 2010-01-18 |
* | | | | | | | | | | | | | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Extend merge-subtree tests to test -Xsubtree=dir. | Avery Pennarun | 2010-01-17 |
| * | | | | | | | | | | | | | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun | 2010-01-17 |
| * | | | | | | | | | | | | | git merge -X<option> | Avery Pennarun | 2010-01-17 |
* | | | | | | | | | | | | | | Merge branch 'jh/notes' (early part) | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | Add more testcases to test fast-import of notes | Johan Herland | 2009-12-07 |
| * | | | | | | | | | | | | | | Rename t9301 to t9350, to make room for more fast-import tests | Johan Herland | 2009-12-07 |
| * | | | | | | | | | | | | | | fast-import: Proper notes tree manipulation | Johan Herland | 2009-12-07 |
* | | | | | | | | | | | | | | | Merge branch 'jc/cache-unmerge' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | rerere forget path: forget recorded resolution | Junio C Hamano | 2010-01-10 |
| * | | | | | | | | | | | | | | | resolve-undo: teach "update-index --unresolve" to use resolve-undo info | Junio C Hamano | 2009-12-25 |
| * | | | | | | | | | | | | | | | resolve-undo: "checkout -m path" uses resolve-undo information | Junio C Hamano | 2009-12-25 |
| * | | | | | | | | | | | | | | | resolve-undo: allow plumbing to clear the information | Junio C Hamano | 2009-12-25 |
| * | | | | | | | | | | | | | | | resolve-undo: basic tests | Junio C Hamano | 2009-12-25 |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'js/exec-error-report' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | start_command: detect execvp failures early | Johannes Sixt | 2010-01-10 |
| * | | | | | | | | | | | | | | | Merge branch 'master' into il/vcs-helper | Junio C Hamano | 2009-12-06 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/ls-files-ignored-pathspec' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | ls-files: fix overeager pathspec optimization | Junio C Hamano | 2010-01-08 |
| * | | | | | | | | | | | | | | | | | t3001: test ls-files -o ignored/dir | Junio C Hamano | 2010-01-08 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/grep-lookahead' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | grep --no-index: allow use of "git grep" outside a git repository | Junio C Hamano | 2010-01-15 |
| * | | | | | | | | | | | | | | | | | | grep: rip out support for external grep | Junio C Hamano | 2010-01-13 |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | Merge branch 'mm/conflict-advice' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 2010-01-12 |
| |/ / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |