summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'jk/maint-config-bogus-section'Junio C Hamano2012-04-302-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | config: reject bogus section names for --rename-sectionJeff King2012-04-252-1/+31
* | | | | | | | | | | | | The seventh batch of topics graduated to 'master'Junio C Hamano2012-04-291-0/+16
* | | | | | | | | | | | | Merge branch 'js/daemon-test-race-fix'Junio C Hamano2012-04-291-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t5570: fix forwarding of git-daemon messages via catJohannes Sixt2012-04-271-11/+11
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'kk/gitweb-omit-expensive'Junio C Hamano2012-04-292-10/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitweb: Option to not display information about ownerKacper Kornet2012-04-262-6/+18
| * | | | | | | | | | | | | gitweb: Option to omit column with time of the last changeKacper Kornet2012-04-252-5/+15
* | | | | | | | | | | | | | Merge branch 'kk/maint-gitweb-missing-owner'Junio C Hamano2012-04-291-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | gitweb: Don't set owner if got empty value from projects.listKacper Kornet2012-04-251-2/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/commit-list-append'Junio C Hamano2012-04-294-45/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit: remove commit_list_reverse()René Scharfe2012-04-252-16/+0
| * | | | | | | | | | | | | revision: append to list instead of insert and reverseRené Scharfe2012-04-251-2/+2
| * | | | | | | | | | | | | sequencer: export commit_list_append()René Scharfe2012-04-253-27/+29
* | | | | | | | | | | | | | Merge branch 'mm/include-userpath'Junio C Hamano2012-04-293-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | config: expand tildes in include.path variableJeff King2012-04-293-1/+18
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'pw/t5800-import-race-fix'Junio C Hamano2012-04-292-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-remote-testgit: fix race when spawning fast-importPete Wyckoff2012-04-242-0/+20
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | 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