summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-05-07Merge branch 'pw/t5800-import-race-fix' into maintLibravatar Junio C Hamano2-0/+20
2012-05-07Merge branch 'rt/cherry-revert-conflict-summary' into maintLibravatar Junio C Hamano1-1/+1
2012-05-07Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maintLibravatar Junio C Hamano1-9/+13
2012-05-07git p4 doc: fix formattingLibravatar Pete Wyckoff1-1/+3
2012-05-03Merge branch 'jc/merge-reduce-parents-early' into maintLibravatar Junio C Hamano5-71/+276
2012-05-03Merge branch 'cb/cherry-pick-rev-path-confusion' into maintLibravatar Junio C Hamano3-11/+19
2012-05-03Merge branch 'cb/http-multi-curl-auth' into maintLibravatar Junio C Hamano2-10/+26
2012-05-03Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintLibravatar Junio C Hamano2-4/+43
2012-05-03Merge branch 'rl/maint-stash-i18n-save-error' into maintLibravatar Junio C Hamano1-2/+2
2012-05-03Merge branch 'jm/maint-strncpy-diff-no-index' into maintLibravatar Junio C Hamano1-21/+17
2012-05-01Git 1.7.10.1Libravatar Junio C Hamano3-3/+32
2012-05-01Merge branch 'pw/fast-import-dataref-parsing' into maintLibravatar Junio C Hamano2-33/+364
2012-05-01Merge branch 'it/fetch-pack-many-refs' into maintLibravatar Junio C Hamano6-6/+162
2012-05-01Merge branch 'jl/maint-submodule-recurse-fetch' into maintLibravatar Junio C Hamano1-3/+3
2012-05-01Merge branch 'jc/maint-blame-minimal' into maintLibravatar Junio C Hamano1-0/+1
2012-05-01Merge branch 'lp/maint-diff-three-dash-with-graph' into maintLibravatar Junio C Hamano3-2/+299
2012-05-01Merge branch 'jk/rebase-i-submodule-conflict-only' into maintLibravatar Junio C Hamano2-1/+31
2012-05-01Merge branch 'maint' of https://github.com/git-l10n/git-poLibravatar Junio C Hamano6-282/+7605
2012-05-01l10n: Initial German translationLibravatar Ralf Thielow1-717/+984
2012-04-28l10n: Update Simplified Chinese translationLibravatar Jiang Xin1-84/+100
2012-04-28l10n: Update git.pot (2 new messages)Libravatar Jiang Xin1-83/+96
2012-04-28Merge maint branch for tracking l10n updates of git stable versionLibravatar Jiang Xin40-213/+779
2012-04-28l10n: Add the German translation team and initialize de.poLibravatar Ralf Thielow2-0/+3508
2012-04-26Start preparing for 1.7.10.1Libravatar Junio C Hamano2-1/+51
2012-04-26Merge branch 'jk/run-command-eacces' into maintLibravatar Junio C Hamano6-7/+86
2012-04-26Merge branch 'jc/push-upstream-sanity' into maintLibravatar Junio C Hamano2-8/+72
2012-04-26Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maintLibravatar Junio C Hamano2-11/+43
2012-04-26Merge branch 'jk/diff-no-rename-empty' into maintLibravatar Junio C Hamano9-14/+45
2012-04-26Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maintLibravatar Junio C Hamano1-1/+1
2012-04-26Merge branch 'jc/commit-unedited-template' into maintLibravatar Junio C Hamano3-24/+65
2012-04-26Merge branch 'jk/add-p-skip-conflicts' into maintLibravatar Junio C Hamano2-7/+44
2012-04-26Merge branch 'jc/commit-hook-authorship' into maintLibravatar Junio C Hamano5-47/+141
2012-04-26Merge branch 'tr/maint-word-diff-regex-sticky' into maintLibravatar Junio C Hamano2-56/+102
2012-04-26Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintLibravatar Junio C Hamano4-32/+73
2012-04-26Sync with 1.7.9.7Libravatar Junio C Hamano5-4/+55
2012-04-26Git 1.7.9.7Libravatar Junio C Hamano3-2/+16
2012-04-26Sync with 1.7.8.6Libravatar Junio C Hamano4-3/+40
2012-04-26Git 1.7.8.6Libravatar Junio C Hamano4-3/+27
2012-04-26Sync with 1.7.7.7Libravatar Junio C Hamano3-2/+16
2012-04-26Git 1.7.7.7Libravatar Junio C Hamano4-3/+18
2012-04-26diff --no-index: use strbuf for temporary pathnamesLibravatar Junio C Hamano1-23/+17
2012-04-26bundle: remove stray single-quote from error messageLibravatar Jonathan Nieder1-1/+1
2012-04-24git-remote-testgit: fix race when spawning fast-importLibravatar Pete Wyckoff2-0/+20
2012-04-19sequencer: remove additional blank lineLibravatar Ralf Thielow1-1/+1
2012-04-18fmt-merge-msg: discard needless merge parentsLibravatar Junio C Hamano2-10/+149
2012-04-17builtin/merge.c: reduce parents earlyLibravatar Junio C Hamano4-28/+43
2012-04-17builtin/merge.c: collect other parents earlyLibravatar Junio C Hamano1-13/+27
2012-04-17builtin/merge.c: remove "remoteheads" global variableLibravatar Junio C Hamano1-23/+28
2012-04-17merge tests: octopus with redundant parentsLibravatar MichaƂ Kiedrowicz3-7/+39
2012-04-17fetch: describe new refs based on where it came fromLibravatar Marc Branchaud2-3/+41