summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* argv-array: fix bogus cast when freeing arrayJeff King2012-09-021-1/+1
* argv-array: add pop functionJeff King2012-09-023-0/+14
* Merge branch 'jk/repack-no-explode-objects-from-old-pack'Junio C Hamano2012-04-297-53/+107
|\
| * gc: use argv-array for sub-commandsJeff King2012-04-181-45/+33
| * argv-array: add a new "pushl" methodJeff King2012-04-183-0/+17
| * argv-array: refactor empty_argv initializationJeff King2012-04-182-3/+2
| * gc: do not explode objects which will be immediately prunedJeff King2012-04-114-11/+61
* | Merge git://git.bogomips.org/git-svnJunio C Hamano2012-04-291-2/+18
|\ \
| * | git-svn: use platform specific auth providersMatthijs Kooijman2012-04-271-2/+18
* | | The sixth batch of topics graduated to 'master'Junio C Hamano2012-04-271-0/+24
* | | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-275-70/+275
|\ \ \
| * | | fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-182-10/+149
| * | | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-174-28/+43
| * | | builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-171-13/+27
| * | | builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-171-23/+28
| * | | merge tests: octopus with redundant parentsMichaƂ Kiedrowicz2012-04-173-7/+39
* | | | Merge branch 'js/fast-import-test-9300'Junio C Hamano2012-04-271-34/+54
|\ \ \ \
| * | | | t9300-fast-import: avoid 'exit' in test_expect_success snippetsJohannes Sixt2012-04-201-34/+54
| | |_|/ | |/| |
* | | | Merge branch 'rt/cherry-revert-conflict-summary'Junio C Hamano2012-04-271-1/+1
|\ \ \ \
| * | | | sequencer: remove additional blank lineRalf Thielow2012-04-191-1/+1
* | | | | Merge branch 'cb/maint-report-mount-point-correctly-in-setup'Junio C Hamano2012-04-271-9/+13
|\ \ \ \ \
| * | | | | properly keep track of current working directoryClemens Buchacher2012-04-151-9/+13
| | |/ / / | |/| | |
* | | | | Merge branch 'cb/cherry-pick-rev-path-confusion'Junio C Hamano2012-04-273-11/+19
|\ \ \ \ \
| * | | | | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-153-11/+19
| |/ / / /
* | | | | Merge branch 'cb/http-multi-curl-auth'Junio C Hamano2012-04-272-10/+26
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | http: use newer curl options for setting credentialsJeff King2012-04-141-2/+11
| * | | | http: clean up leak in init_curl_http_authJeff King2012-04-141-3/+3
| * | | | fix http auth with multiple curl handlesJeff King2012-04-102-5/+7
| * | | | http auth fails with multiple curl handlesClemens Buchacher2012-04-101-10/+15
| |/ / /
* | | | Update draft release notes to 1.7.11Junio C Hamano2012-04-261-53/+11
* | | | Merge branch 'rl/maint-stash-i18n-save-error'Junio C Hamano2012-04-261-2/+2
|\ \ \ \
| * | | | stash: use eval_gettextln correctlyRoss Lagerwall2012-04-141-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref'Junio C Hamano2012-04-262-4/+43
|\ \ \ \
| * | | | fetch: describe new refs based on where it came fromMarc Branchaud2012-04-172-3/+41
| * | | | fetch: Give remote_ref to update_local_ref() as wellMarc Branchaud2012-04-171-1/+2
| |/ / /
* | | | Merge branch 'jm/maint-strncpy-diff-no-index'Junio C Hamano2012-04-261-21/+17
|\ \ \ \
| * | | | diff --no-index: use strbuf for temporary pathnamesJunio C Hamano2012-04-261-23/+17
| * | | | diff: avoid stack-buffer-read-overrun for very long nameJim Meyering2012-04-161-0/+2
| |/ / /
* | | | Merge bundle error message fix inJunio C Hamano2012-04-266-4/+105
|\ \ \ \
| * | | | Start preparing for 1.7.10.1Junio C Hamano2012-04-262-1/+51
| * | | | Merge branch 'jk/run-command-eacces' into maintJunio C Hamano2012-04-266-7/+86
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-262-8/+72
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maintJunio C Hamano2012-04-262-11/+43
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-269-14/+45
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maintJunio C Hamano2012-04-261-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-263-24/+65
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-p-skip-conflicts' into maintJunio C Hamano2012-04-262-7/+44
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-265-47/+141
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2012-04-262-56/+102
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintJunio C Hamano2012-04-264-32/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ \