Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2012-04-29 |
|\ | |||
| * | git-svn: use platform specific auth providers | Matthijs Kooijman | 2012-04-27 |
* | | The sixth batch of topics graduated to 'master' | Junio C Hamano | 2012-04-27 |
* | | Merge branch 'jc/merge-reduce-parents-early' | Junio C Hamano | 2012-04-27 |
|\ \ | |||
| * | | 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 |
| * | | builtin/merge.c: collect other parents early | Junio C Hamano | 2012-04-17 |
| * | | builtin/merge.c: remove "remoteheads" global variable | Junio C Hamano | 2012-04-17 |
| * | | merge tests: octopus with redundant parents | MichaĆ Kiedrowicz | 2012-04-17 |
* | | | Merge branch 'js/fast-import-test-9300' | Junio C Hamano | 2012-04-27 |
|\ \ \ | |||
| * | | | t9300-fast-import: avoid 'exit' in test_expect_success snippets | Johannes Sixt | 2012-04-20 |
* | | | | Merge branch 'rt/cherry-revert-conflict-summary' | Junio C Hamano | 2012-04-27 |
|\ \ \ \ | |||
| * | | | | sequencer: remove additional blank line | Ralf Thielow | 2012-04-19 |
* | | | | | Merge branch 'cb/maint-report-mount-point-correctly-in-setup' | Junio C Hamano | 2012-04-27 |
|\ \ \ \ \ | |||
| * | | | | | properly keep track of current working directory | Clemens Buchacher | 2012-04-15 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'cb/cherry-pick-rev-path-confusion' | Junio C Hamano | 2012-04-27 |
|\ \ \ \ \ | |||
| * | | | | | cherry-pick: do not expect file arguments | Clemens Buchacher | 2012-04-15 |
| |/ / / / | |||
* | | | | | Merge branch 'cb/http-multi-curl-auth' | Junio C Hamano | 2012-04-27 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||
| * | | | | http: use newer curl options for setting credentials | Jeff King | 2012-04-14 |
| * | | | | http: clean up leak in init_curl_http_auth | Jeff King | 2012-04-14 |
| * | | | | fix http auth with multiple curl handles | Jeff King | 2012-04-10 |
| * | | | | http auth fails with multiple curl handles | Clemens Buchacher | 2012-04-10 |
| |/ / / | |||
* | | | | Update draft release notes to 1.7.11 | Junio C Hamano | 2012-04-26 |
* | | | | Merge branch 'rl/maint-stash-i18n-save-error' | Junio C Hamano | 2012-04-26 |
|\ \ \ \ | |||
| * | | | | stash: use eval_gettextln correctly | Ross Lagerwall | 2012-04-14 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref' | Junio C Hamano | 2012-04-26 |
|\ \ \ \ | |||
| * | | | | fetch: describe new refs based on where it came from | Marc Branchaud | 2012-04-17 |
| * | | | | fetch: Give remote_ref to update_local_ref() as well | Marc Branchaud | 2012-04-17 |
| |/ / / | |||
* | | | | Merge branch 'jm/maint-strncpy-diff-no-index' | Junio C Hamano | 2012-04-26 |
|\ \ \ \ | |||
| * | | | | diff --no-index: use strbuf for temporary pathnames | Junio C Hamano | 2012-04-26 |
| * | | | | diff: avoid stack-buffer-read-overrun for very long name | Jim Meyering | 2012-04-16 |
| |/ / / | |||
* | | | | Merge bundle error message fix in | Junio C Hamano | 2012-04-26 |
|\ \ \ \ | |||
| * | | | | Start preparing for 1.7.10.1 | Junio C Hamano | 2012-04-26 |
| * | | | | Merge branch 'jk/run-command-eacces' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'jc/push-upstream-sanity' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/diff-no-rename-empty' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/commit-unedited-template' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-p-skip-conflicts' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/commit-hook-authorship' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/maint-word-diff-regex-sticky' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Sync with 1.7.9.7 | Junio C Hamano | 2012-04-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | Git 1.7.9.7v1.7.9.7 | Junio C Hamano | 2012-04-26 |
| | * | | | | | | | | | | | | | Sync with 1.7.8.6 | Junio C Hamano | 2012-04-26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | Git 1.7.8.6v1.7.8.6 | Junio C Hamano | 2012-04-26 |
| | | * | | | | | | | | | | | | Sync with 1.7.7.7 | Junio C Hamano | 2012-04-26 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | | | | Git 1.7.7.7v1.7.7.7 | Junio C Hamano | 2012-04-26 |
| | | | * | | | | | | | | | | | | bundle: remove stray single-quote from error message | Jonathan Nieder | 2012-04-26 |