summaryrefslogtreecommitdiffstats
path: root/t/t6031-merge-recursive.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2012-04-24git-svn: drop redundant blocking of SIGPIPERoman Kagan1-1/+1
2012-04-24git-svn: ignore SIGPIPERoman Kagan1-0/+5
2012-04-24git-svn: use POSIX::sigprocmask to block signalsRoman Kagan1-6/+9
2012-04-23RelNotes: the fourth batch of topics graduated to 'master'Junio C Hamano1-0/+27
2012-04-22completion: fix completion after 'git --option <TAB>'SZEDER Gábor2-1/+19
2012-04-22completion: avoid trailing space for --exec-pathJonathan Nieder2-1/+7
2012-04-22completion: add missing general optionsFelipe Contreras2-0/+18
2012-04-22completion: simplify by using $prevFelipe Contreras1-2/+2
2012-04-22completion: simplify __gitcomp_1Felipe Contreras1-6/+6
2012-04-22tests: add tests for the __gitcomp() completion helper functionSZEDER Gábor1-0/+85
2012-04-22revert: add missing va_endChristian Couder1-0/+1
2012-04-21RelNotes: the third batchJunio C Hamano1-1/+27
2012-04-19t9400: fix gnuism in grepJunio C Hamano1-2/+2
2012-04-18git-sh-setup.sh: Add an pwd() function for MinGWRamsay Jones1-0/+4
2012-04-18git-submodule.sh: Don't use $path variable in eval_gettext stringRamsay Jones1-79/+82
2012-04-18compat/mingw.h: Set S_ISUID to prevent a fast-import test failureRamsay Jones1-3/+4
2012-04-17mergesort: rename it to llist_mergesort()Junio C Hamano4-11/+19
2012-04-17Do not use SHELL_PATH from build system in prepare_shell_cmd on WindowsJohannes Sixt1-0/+4
2012-04-16RelNotes: the second batch of topics graduated to 'master'Junio C Hamano1-0/+41
2012-04-16RelNotes: the first batch of topics graduated to 'master'Junio C Hamano1-0/+19
2012-04-16merge overwrites unstaged changes in renamed fileClemens Buchacher1-0/+9
2012-04-15i18n: mark @{upstream} error messages for translationZbigniew Jędrzejewski-Szmek2-9/+9
2012-04-15Be more specific if upstream branch is not trackedZbigniew Jędrzejewski-Szmek2-4/+9
2012-04-15Provide better message for barnhc_wiht_tpyo@{u}Zbigniew Jędrzejewski-Szmek2-2/+5
2012-04-15Provide branch name in error message when using @{u}Zbigniew Jędrzejewski-Szmek2-6/+10
2012-04-15t1507: add tests to document @{upstream} behaviourZbigniew Jędrzejewski-Szmek1-3/+78