summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/maint-reflog-beyond-horizon'Junio C Hamano2010-09-033-9/+29
|\
| * t1503: fix broken test_must_fail callsJon Seymour2010-08-311-2/+2
| * rev-parse: tests git rev-parse --verify master@{n}, for various nJon Seymour2010-08-242-0/+20
| * sha1_name.c: use warning in preference to fprintf(stderrJon Seymour2010-08-241-5/+4
| * rev-parse: exit with non-zero status if ref@{n} is not valid.Jon Seymour2010-08-241-4/+5
* | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-037-64/+69
|\ \
| * | t7609-merge-co-error-msgs: test non-fast forward case too.Matthieu Moy2010-09-031-2/+10
| * | Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-034-9/+3
| * | setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-035-5/+8
| * | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-036-54/+54
* | | Merge branch 'nd/maint-fix-replace'Junio C Hamano2010-09-032-2/+2
|\ \ \
| * | | parse_object: pass on the original sha1, not the replaced oneNguyễn Thái Ngọc Duy2010-09-032-2/+2
* | | | Merge branch 'ab/compat-regex'Junio C Hamano2010-09-0310-5105/+11193
|\ \ \ \
| * | | | Fix compat/regex ANSIfication on MinGWJohannes Sixt2010-08-261-6/+5
| * | | | autoconf: regex library detection typofixJunio C Hamano2010-08-221-1/+1
| * | | | autoconf: don't use platform regex if it lacks REG_STARTENDJonathan Nieder2010-08-192-0/+22
| * | | | t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTENDÆvar Arnfjörð Bjarmason2010-08-191-1/+1
| * | | | compat/regex: get rid of old-style definitionJunio C Hamano2010-08-192-69/+55
| * | | | compat/regex: define out variables only used under RE_ENABLE_I18NÆvar Arnfjörð Bjarmason2010-08-192-1/+3
| * | | | Change regerror() declaration from K&R style to ANSI C (C89)Frank Li2010-08-181-5/+2
| * | | | compat/regex: get the gawk regex engine to compile within gitÆvar Arnfjörð Bjarmason2010-08-182-0/+7
| * | | | compat/regex: use the regex engine from gawk for compatÆvar Arnfjörð Bjarmason2010-08-186-5104/+11179
| | |_|/ | |/| |
* | | | Merge branch 'nd/clone-depth-zero'Junio C Hamano2010-09-031-2/+5
|\ \ \ \
| * | | | clone: warn users --depth is ignored in local clonesNguyễn Thái Ngọc Duy2010-08-241-2/+5
* | | | | Merge branch 'jn/maint-doc-user-manual-html-doctype'Junio C Hamano2010-09-032-2/+5
|\ \ \ \ \
| * | | | | docs: fix Makefile dependency for user manualJeff King2010-08-211-1/+1
| * | | | | Documentation: set a !DOCTYPE for user manualJonathan Nieder2010-08-201-1/+4
* | | | | | Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano2010-09-032-3/+7
|\ \ \ \ \ \
| * | | | | | mergetool: Remove explicit references to /dev/ttyCharles Bailey2010-08-202-3/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jn/apply-filename-with-sp'Junio C Hamano2010-09-0321-41/+456
|\ \ \ \ \ \
| * | | | | | apply: handle traditional patches with space in filenameJonathan Nieder2010-08-212-16/+181
| * | | | | | tests: exercise "git apply" with weird filenamesJonathan Nieder2010-08-2119-0/+213
| * | | | | | apply: split quoted filename handling into new functionJonathan Nieder2010-08-212-33/+70
| |/ / / / /
* | | | | | Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano2010-09-032-26/+71
|\ \ \ \ \ \
| * | | | | | t7606: Avoid using head as a file nameBrian Gernhardt2010-08-241-4/+4
| * | | | | | merge: let custom strategies intervene in trivial mergesJonathan Nieder2010-08-152-3/+34
| * | | | | | t7606 (merge-theirs): modernize styleJonathan Nieder2010-08-151-26/+40
| |/ / / / /
* | | | | | Merge branch 'jc/maint-doc-em-dash'Junio C Hamano2010-09-037-18/+19
|\ \ \ \ \ \
| * | | | | | Work around em-dash handling in newer AsciiDocJunio C Hamano2010-08-247-18/+19
* | | | | | | Merge branch 'mg/doc-bundle'Junio C Hamano2010-09-031-33/+34
|\ \ \ \ \ \ \
| * | | | | | | git-bundle.txt: Clarify rev-list-args restrictionsMichael J Gruber2010-08-231-1/+2
| * | | | | | | git-bundle.txt: whitespace cleanupMichael J Gruber2010-08-231-28/+28
| * | | | | | | git-bundle.txt: CleanupMichael J Gruber2010-08-231-9/+9
* | | | | | | | Merge branch 'jn/doc-backslash'Junio C Hamano2010-09-0326-59/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: remove stray backslash in show-branch discussionJonathan Nieder2010-08-201-4/+4
| * | | | | | | | Documentation: remove stray backslashes from "Fighting regressions" articleJonathan Nieder2010-08-201-1/+1
| * | | | | | | | Documentation: do not convert ... operator to ellipsesJonathan Nieder2010-08-204-4/+4
| * | | | | | | | Documentation: avoid stray backslash in user manualJonathan Nieder2010-08-201-2/+2
| * | | | | | | | Documentation: avoid stray backslashes in core tutorialJonathan Nieder2010-08-201-9/+9
| * | | | | | | | Documentation: remove stray backslashes in rev-parse manualJonathan Nieder2010-08-201-4/+5
View Lorry Controller Status