aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge l10n updates from branch 'maint' into masterJiang Xin2012-05-02
|\
| * l10n: Initial German translationRalf Thielow2012-05-01
* | l10n: Update Simplified Chinese translationJiang Xin2012-04-30
* | Merge branch 'maint'Jiang Xin2012-04-28
|\ \ | |/
| * l10n: Update Simplified Chinese translationJiang Xin2012-04-28
| * l10n: Update git.pot (2 new messages)Jiang Xin2012-04-28
| * Merge maint branch for tracking l10n updates of git stable versionJiang Xin2012-04-28
| |\
* | | l10n: Update git.pot (33 new, 24 deleted messages)Jiang Xin2012-04-28
* | | Merge master branch for tracking l10n updates of next releaseJiang Xin2012-04-28
|\ \ \ | |/ / |/| |
| * | The sixth batch of topics graduated to 'master'Junio C Hamano2012-04-27
| * | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-27
| |\ \
| | * | fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-18
| | * | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-17
| | * | builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-17
| | * | builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-17
| | * | merge tests: octopus with redundant parentsMichaƂ Kiedrowicz2012-04-17
| * | | Merge branch 'js/fast-import-test-9300'Junio C Hamano2012-04-27
| |\ \ \
| | * | | t9300-fast-import: avoid 'exit' in test_expect_success snippetsJohannes Sixt2012-04-20
| * | | | Merge branch 'rt/cherry-revert-conflict-summary'Junio C Hamano2012-04-27
| |\ \ \ \
| | * | | | sequencer: remove additional blank lineRalf Thielow2012-04-19
| * | | | | Merge branch 'cb/maint-report-mount-point-correctly-in-setup'Junio C Hamano2012-04-27
| |\ \ \ \ \
| | * | | | | properly keep track of current working directoryClemens Buchacher2012-04-15
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'cb/cherry-pick-rev-path-confusion'Junio C Hamano2012-04-27
| |\ \ \ \ \
| | * | | | | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-15
| | |/ / / /
| * | | | | Merge branch 'cb/http-multi-curl-auth'Junio C Hamano2012-04-27
| |\ \ \ \ \
| | * | | | | http: use newer curl options for setting credentialsJeff King2012-04-14
| | * | | | | http: clean up leak in init_curl_http_authJeff King2012-04-14
| | * | | | | fix http auth with multiple curl handlesJeff King2012-04-10
| | * | | | | http auth fails with multiple curl handlesClemens Buchacher2012-04-10
| | |/ / / /
| * | | | | Update draft release notes to 1.7.11Junio C Hamano2012-04-26
| * | | | | Merge branch 'rl/maint-stash-i18n-save-error'Junio C Hamano2012-04-26
| |\ \ \ \ \
| | * | | | | stash: use eval_gettextln correctlyRoss Lagerwall2012-04-14
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref'Junio C Hamano2012-04-26
| |\ \ \ \ \
| | * | | | | fetch: describe new refs based on where it came fromMarc Branchaud2012-04-17
| | * | | | | fetch: Give remote_ref to update_local_ref() as wellMarc Branchaud2012-04-17
| | |/ / / /
| * | | | | Merge branch 'jm/maint-strncpy-diff-no-index'Junio C Hamano2012-04-26
| |\ \ \ \ \
| | * | | | | diff --no-index: use strbuf for temporary pathnamesJunio C Hamano2012-04-26
| | * | | | | diff: avoid stack-buffer-read-overrun for very long nameJim Meyering2012-04-16
| | |/ / / /
| * | | | | Merge bundle error message fix inJunio C Hamano2012-04-26
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Start preparing for 1.7.10.1Junio C Hamano2012-04-26
| | * | | | Merge branch 'jk/run-command-eacces' into maintJunio C Hamano2012-04-26
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-26
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maintJunio C Hamano2012-04-26
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-26
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maintJunio C Hamano2012-04-26
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-26
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-p-skip-conflicts' into maintJunio C Hamano2012-04-26
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintJunio C Hamano2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \