Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maint | Junio C Hamano | 2012-05-07 |
|\ | |||
| * | t/gitweb-lib: use $PERL_PATH to run gitweb | Jeff King | 2012-05-01 |
* | | Merge branch 'js/daemon-test-race-fix' into maint | Junio C Hamano | 2012-05-07 |
|\ \ | |||
| * | | t5570: fix forwarding of git-daemon messages via cat | Johannes Sixt | 2012-04-27 |
* | | | Merge branch 'jk/maint-config-bogus-section' into maint | Junio C Hamano | 2012-05-07 |
|\ \ \ | |||
| * | | | config: reject bogus section names for --rename-section | Jeff King | 2012-04-25 |
| |/ / | |||
* | | | Merge branch 'pw/t5800-import-race-fix' into maint | Junio C Hamano | 2012-05-07 |
|\ \ \ | |||
| * | | | git-remote-testgit: fix race when spawning fast-import | Pete Wyckoff | 2012-04-24 |
| |/ / | |||
* | | | Merge branch 'jc/merge-reduce-parents-early' into maint | Junio C Hamano | 2012-05-03 |
|\ \ \ | |||
| * | | | fmt-merge-msg: discard needless merge parents | Junio C Hamano | 2012-04-18 |
| * | | | builtin/merge.c: reduce parents early | Junio C Hamano | 2012-04-17 |
| * | | | merge tests: octopus with redundant parents | MichaĆ Kiedrowicz | 2012-04-17 |
* | | | | Merge branch 'cb/http-multi-curl-auth' into maint | Junio C Hamano | 2012-05-03 |
|\ \ \ \ | |||
| * | | | | fix http auth with multiple curl handles | Jeff King | 2012-04-10 |
| * | | | | http auth fails with multiple curl handles | Clemens Buchacher | 2012-04-10 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maint | Junio C Hamano | 2012-05-03 |
|\ \ \ \ | |||
| * | | | | fetch: describe new refs based on where it came from | Marc Branchaud | 2012-04-17 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'pw/fast-import-dataref-parsing' into maint | Junio C Hamano | 2012-05-01 |
|\ \ \ \ | |||
| * | | | | fast-import: tighten parsing of datarefs | Pete Wyckoff | 2012-04-10 |
| |/ / / | |||
| * | | | Merge branch 'jn/maint-fast-import-empty-ls' into maint | Junio C Hamano | 2012-03-26 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'ms/maint-config-error-at-eol-linecount' into maint | Junio C Hamano | 2012-03-26 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'maint-1.7.8' into maint | Junio C Hamano | 2012-03-20 |
| |\ \ \ \ \ | |||
* | \ \ \ \ \ | Merge branch 'it/fetch-pack-many-refs' into maint | Junio C Hamano | 2012-05-01 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | remote-curl: main test case for the OS command line overflow | Ivan Todoroski | 2012-04-10 |
| * | | | | | | | fetch-pack: test cases for the new --stdin option | Ivan Todoroski | 2012-04-10 |
* | | | | | | | | Merge branch 'lp/maint-diff-three-dash-with-graph' into maint | Junio C Hamano | 2012-05-01 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t4202: add test for "log --graph --stat -p" separator lines | Lucian Poston | 2012-03-20 |
* | | | | | | | | | Merge branch 'jk/rebase-i-submodule-conflict-only' into maint | Junio C Hamano | 2012-05-01 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | rebase -i continue: don't skip commits that only change submodules | John Keeping | 2012-04-09 |
| * | | | | | | | | | Merge branch 'tr/cache-tree' into maint-1.7.8 | Junio C Hamano | 2012-04-09 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8 | Junio C Hamano | 2012-04-09 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8 | Junio C Hamano | 2012-04-09 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8 | Junio C Hamano | 2012-04-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8 | Junio C Hamano | 2012-03-20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8 | Junio C Hamano | 2012-03-20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/run-command-eacces' into maint | Junio C Hamano | 2012-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | run-command: treat inaccessible directories as ENOENT | Jeff King | 2012-04-05 |
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'jc/push-upstream-sanity' into maint | Junio C Hamano | 2012-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | push: error out when the "upstream" semantics does not make sense | Junio C Hamano | 2012-04-05 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint | Junio C Hamano | 2012-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | clean: preserve nested git worktree in subdirectories | Junio C Hamano | 2012-03-15 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-no-rename-empty' into maint | Junio C Hamano | 2012-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | merge-recursive: don't detect renames of empty files | Jeff King | 2012-03-23 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/commit-unedited-template' into maint | Junio C Hamano | 2012-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | commit: rephrase the error when user did not touch templated log message | Junio C Hamano | 2012-03-30 |
| * | | | | | | | | | | | | | | | | | | commit: do not trigger bogus "has templated message edited" check | Junio C Hamano | 2012-03-30 |
| * | | | | | | | | | | | | | | | | | | t7501: test the right kind of breakage | Junio C Hamano | 2012-03-30 |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/add-p-skip-conflicts' into maint | Junio C Hamano | 2012-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | add--interactive: ignore unmerged entries in patch mode | Jeff King | 2012-04-05 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/commit-hook-authorship' into maint | Junio C Hamano | 2012-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |