summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-25config: reject bogus section names for --rename-sectionLibravatar Jeff King2-1/+31
2012-04-24git-remote-testgit: fix race when spawning fast-importLibravatar Pete Wyckoff2-0/+20
2012-04-21revert: add missing va_endLibravatar Christian Couder1-0/+1
2012-04-20t9300-fast-import: avoid 'exit' in test_expect_success snippetsLibravatar Johannes Sixt1-34/+54
2012-04-19sequencer: remove additional blank lineLibravatar Ralf Thielow1-1/+1
2012-04-19t9400: fix gnuism in grepLibravatar Junio C Hamano1-2/+2
2012-04-18fmt-merge-msg: discard needless merge parentsLibravatar Junio C Hamano2-10/+149
2012-04-18gc: use argv-array for sub-commandsLibravatar Jeff King1-45/+33
2012-04-18argv-array: add a new "pushl" methodLibravatar Jeff King3-0/+17
2012-04-18argv-array: refactor empty_argv initializationLibravatar Jeff King2-3/+2
2012-04-18Prevent graph_width of stat width from falling below minLibravatar Lucian Poston2-8/+12
2012-04-18t4052: Test diff-stat output with minimum columnsLibravatar Lucian Poston1-0/+28
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
2012-04-17fetch: Give remote_ref to update_local_ref() as wellLibravatar Marc Branchaud1-1/+2
2012-04-16t4052: Adjust --graph --stat output for prefixesLibravatar Lucian Poston1-9/+25
2012-04-16Adjust stat width calculations to take --graph output into accountLibravatar Lucian Poston1-1/+1
2012-04-16Add output_prefix_length to diff_optionsLibravatar Lucian Poston2-0/+4
2012-04-16t4052: test --stat output with --graphLibravatar Zbigniew Jędrzejewski-Szmek1-4/+74
2012-04-16diff: avoid stack-buffer-read-overrun for very long nameLibravatar Jim Meyering1-0/+2
2012-04-15cherry-pick: do not expect file argumentsLibravatar Clemens Buchacher3-11/+19
2012-04-15properly keep track of current working directoryLibravatar Clemens Buchacher1-9/+13
2012-04-14stash: use eval_gettextln correctlyLibravatar Ross Lagerwall1-2/+2
2012-04-14submodules: recursive fetch also checks new tags for submodule commitsLibravatar Jens Lehmann1-3/+3
2012-04-14http: use newer curl options for setting credentialsLibravatar Jeff King1-2/+11
2012-04-14http: clean up leak in init_curl_http_authLibravatar Jeff King1-3/+3
2012-04-12Fix httpd tests that broke when non-ff push advice changedLibravatar Christopher Tiwald2-2/+2
2012-04-12l10n: Add Danish team (da) to list of teamsLibravatar Byrial Jensen1-0/+4
2012-04-12l10n: New da.po file with 0 translationsLibravatar Byrial Jensen1-0/+3503
2012-04-11blame: accept --need-minimalLibravatar Junio C Hamano1-0/+1
2012-04-11gc: do not explode objects which will be immediately prunedLibravatar Jeff King4-11/+61