Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6 | Junio C Hamano | 2010-03-07 |
|\ | |||
| * | lib-patch-mode.sh: Fix permission | Junio C Hamano | 2010-01-30 |
| * | Merge commit 'b319ef7' into jc/maint-fix-test-perm | Junio C Hamano | 2010-01-30 |
| |\ | |||
| * | | t6000lib: Fix permission | Junio C Hamano | 2010-01-30 |
* | | | Merge branch 'sp/maint-push-sideband' into maint-1.6.6 | Junio C Hamano | 2010-03-07 |
|\ \ \ | |||
| * | | | receive-pack: Send internal errors over side-band #2 | Shawn O. Pearce | 2010-02-10 |
| * | | | t5401: Use a bare repository for the remote peer | Shawn O. Pearce | 2010-02-09 |
| * | | | receive-pack: Send hook output over side band #2 | Shawn O. Pearce | 2010-02-05 |
* | | | | Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6 | Junio C Hamano | 2010-03-07 |
|\ \ \ \ | |||
| * | | | | rm: fix bug in recursive subdirectory removal | Jeff King | 2010-02-18 |
* | | | | | Merge branch 'cc/maint-bisect-paths' into maint-1.6.6 | Junio C Hamano | 2010-03-07 |
|\ \ \ \ \ | |||
| * | | | | | bisect: error out when passing bad path parameters | Christian Couder | 2010-03-01 |
* | | | | | | t3301-notes: insert a shbang line in ./fake_editor.sh | Johannes Sixt | 2010-02-25 |
* | | | | | | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-02-16 |
|\ \ \ \ \ \ | |/ / / / / | |||
| * | | | | | stash pop: remove 'apply' options during 'drop' invocation | Thomas Rast | 2010-02-15 |
* | | | | | | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-02-10 |
|\ \ \ \ \ \ | |/ / / / / | |||
| * | | | | | t8003: check exit code of command and error message separately | Junio C Hamano | 2010-02-10 |
* | | | | | | Merge branch 'sp/maint-fast-import-large-blob' into maint | Junio C Hamano | 2010-02-10 |
|\ \ \ \ \ \ | |||
| * | | | | | | fast-import: Stream very large blobs directly to pack | Shawn O. Pearce | 2010-02-01 |
* | | | | | | | Merge branch 'jc/maint-reflog-bad-timestamp' into maint | Junio C Hamano | 2010-02-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t0101: use a fixed timestamp when searching in the reflog | Junio C Hamano | 2010-01-27 |
| * | | | | | | | approxidate_careful() reports errorneous date string | Junio C Hamano | 2010-01-26 |
* | | | | | | | | Merge branch 'jh/maint-config-file-prefix' into maint | Junio C Hamano | 2010-02-10 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dir | Johan Herland | 2010-01-26 |
* | | | | | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint | Junio C Hamano | 2010-02-10 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | checkout -m path: fix recreating conflicts | Junio C Hamano | 2010-01-06 |
* | | | | | | | | | | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-02-08 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | blame: prevent a segv when -L given start > EOF | Jay Soffian | 2010-02-08 |
| * | | | | | | | | | Merge branch 'sb/maint-octopus' into maint-1.6.5 | Junio C Hamano | 2010-02-01 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | archive: simplify archive format guessing | René Scharfe | 2010-02-07 |
| |_|_|_|_|_|/ / / |/| | | | | | | | | |||
* | | | | | | | | | Merge branch 'jc/maint-limit-note-output' into maint | Junio C Hamano | 2010-02-05 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||
| * | | | | | | | | 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 |
* | | | | | | | | | ignore duplicated slashes in make_relative_path() | Junio C Hamano | 2010-01-22 |
|/ / / / / / / / | |||
* | | | | | | | | Merge branch 'bg/maint-remote-update-default' into maint | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Fix "git remote update" with remotes.defalt set | Björn Gustavsson | 2009-12-31 |
* | | | | | | | | | Merge branch 'sb/maint-octopus' into maint | Junio C Hamano | 2010-01-20 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| * | | | | | | | | octopus: reenable fast-forward merges | Stephen Boyd | 2009-12-13 |
| * | | | | | | | | octopus: make merge process simpler to follow | Stephen Boyd | 2009-12-13 |
* | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | reset: unbreak hard resets with GIT_WORK_TREE | Jeff King | 2009-12-30 |
| * | | | | | | | | | 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 |
* | | | | | | | | | | | | | | | | remote-curl: Fix Accept header for smart HTTP connections | Shawn O. Pearce | 2010-01-12 |