summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-18git-sh-setup.sh: Add an pwd() function for MinGWLibravatar Ramsay Jones1-0/+4
2012-04-18git-submodule.sh: Don't use $path variable in eval_gettext stringLibravatar Ramsay Jones1-79/+82
2012-04-18compat/mingw.h: Set S_ISUID to prevent a fast-import test failureLibravatar Ramsay Jones1-3/+4
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-17mergesort: rename it to llist_mergesort()Libravatar Junio C Hamano4-11/+19
2012-04-17Do not use SHELL_PATH from build system in prepare_shell_cmd on WindowsLibravatar Johannes Sixt1-0/+4
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-16RelNotes: the second batch of topics graduated to 'master'Libravatar Junio C Hamano1-0/+41
2012-04-16Merge branch 'jk/add-p-skip-conflicts'Libravatar Junio C Hamano2-7/+44
2012-04-16Merge branch 'jc/commit-unedited-template'Libravatar Junio C Hamano3-24/+65
2012-04-16Merge branch 'bw/spawn-via-shell-path'Libravatar Junio C Hamano2-1/+12
2012-04-16Merge branch 'wk/gitweb-snapshot-use-if-modified-since'Libravatar Junio C Hamano2-27/+98
2012-04-16Merge branch 'jk/http-backend-keep-committer-ident-env'Libravatar Junio C Hamano3-13/+37
2012-04-16Merge branch 'sl/autoconf'Libravatar Junio C Hamano1-98/+99
2012-04-16Merge branch 'jk/branch-quiet'Libravatar Junio C Hamano5-11/+22
2012-04-16Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Libravatar Junio C Hamano1-1/+1
2012-04-16Merge branch 'jk/diff-no-rename-empty'Libravatar Junio C Hamano9-14/+45
2012-04-16Merge branch 'jc/maint-clean-nested-worktree-in-subdir'Libravatar Junio C Hamano2-11/+43
2012-04-16Merge branch 'rs/unpack-trees-leakfix'Libravatar Junio C Hamano1-10/+17
2012-04-16Merge branch 'nl/rebase-i-cheat-sheet'Libravatar Junio C Hamano1-0/+2
2012-04-16diff: avoid stack-buffer-read-overrun for very long nameLibravatar Jim Meyering1-0/+2
2012-04-15RelNotes: the first batch of topics graduated to 'master'Libravatar Junio C Hamano1-0/+19
2012-04-15Merge branch 'da/difftool-test'Libravatar Junio C Hamano1-0/+11
2012-04-15Merge branch 'zj/test-cred-helper-nicer-prove'Libravatar Junio C Hamano1-24/+45
2012-04-15Merge branch 'jh/notes-merge-in-git-dir-worktree'Libravatar Junio C Hamano4-32/+73
2012-04-15Merge branch 'tr/maint-word-diff-regex-sticky'Libravatar Junio C Hamano2-56/+102
2012-04-15Merge branch 'jn/diffstat-tests'Libravatar Junio C Hamano16-259/+354
2012-04-15Merge branch 'jc/diff-algo-cleanup'Libravatar Junio C Hamano8-25/+24
2012-04-15Merge branch 'jc/commit-hook-authorship'Libravatar Junio C Hamano5-47/+141
2012-04-15Merge branch 'nd/stream-more'Libravatar Junio C Hamano11-75/+221
2012-04-15merge overwrites unstaged changes in renamed fileLibravatar Clemens Buchacher1-0/+9
2012-04-15i18n: mark @{upstream} error messages for translationLibravatar Zbigniew Jędrzejewski-Szmek2-9/+9
2012-04-15Be more specific if upstream branch is not trackedLibravatar Zbigniew Jędrzejewski-Szmek2-4/+9
2012-04-15Provide better message for barnhc_wiht_tpyo@{u}Libravatar Zbigniew Jędrzejewski-Szmek2-2/+5
2012-04-15Provide branch name in error message when using @{u}Libravatar Zbigniew Jędrzejewski-Szmek2-6/+10
2012-04-15t1507: add tests to document @{upstream} behaviourLibravatar Zbigniew Jędrzejewski-Szmek1-3/+78
2012-04-15tests: add initial bash completion testsLibravatar Felipe Contreras1-0/+120
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-15fast-import doc: cat-blob and ls responses need to be consumed quicklyLibravatar Jonathan Nieder1-3/+39
2012-04-14stash: use eval_gettextln correctlyLibravatar Ross Lagerwall1-2/+2