summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-08-20Documentation: clarify quoting in gitignore docsLibravatar Jonathan Nieder1-2/+2
2010-08-20Documentation: clarify quoting in "git rm" exampleLibravatar Jonathan Nieder1-3/+3
2010-08-20Documentation: add missing quotes to "git grep" examplesLibravatar Jonathan Nieder1-2/+2
2010-08-20Documentation: clarify quoting in "git add" exampleLibravatar Jonathan Nieder1-2/+2
2010-08-20Documentation: unbreak regex in show-ref manualLibravatar Jonathan Nieder2-2/+3
2010-08-20Documentation: quoting trouble in "git rm" discussionLibravatar Jonathan Nieder2-1/+3
2010-08-20Documentation: tweak description of log.dateLibravatar Jonathan Nieder1-4/+5
2010-08-20mergetool: Remove explicit references to /dev/ttyLibravatar Charles Bailey2-3/+7
2010-08-20Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2010-08-20Merge branch 'jc/maint-follow-rename-fix' into maintLibravatar Junio C Hamano5-18/+41
2010-08-20Merge branch 'jn/maint-plug-leak' into maintLibravatar Junio C Hamano3-3/+13
2010-08-20Merge branch 'jn/fix-abbrev' into maintLibravatar Junio C Hamano5-4/+3
2010-08-20Merge branch 'vs/doc-spell' into maintLibravatar Junio C Hamano9-16/+18
2010-08-20Merge branch 'jn/rebase-rename-am' into maintLibravatar Junio C Hamano5-202/+345
2010-08-20Merge branch 'jn/doc-pull' into maintLibravatar Junio C Hamano1-11/+54
2010-08-20Merge branch 'bc/use-more-hardlinks-in-install' into maintLibravatar Junio C Hamano1-3/+12
2010-08-20Merge branch 'tr/rfc-reset-doc' into maintLibravatar Junio C Hamano1-169/+178
2010-08-20builtin/checkout: Fix message when switching to an existing branchLibravatar Ramkumar Ramachandra1-1/+4
2010-08-20Documentation: set a !DOCTYPE for user manualLibravatar Jonathan Nieder1-1/+4
2010-08-20xmalloc: include size in the failure messageLibravatar Matthieu Moy1-1/+2
2010-08-20merge-recursive: Avoid excessive output for and reprocessing of renamesLibravatar Elijah Newren1-6/+2
2010-08-19Merge branch 'maint' to sync with 1.7.2.2Libravatar Junio C Hamano3-2/+25
2010-08-19Git 1.7.2.2Libravatar Junio C Hamano4-3/+26
2010-08-19Merge branch 'tr/xsize-bits' into maintLibravatar Junio C Hamano1-0/+2
2010-08-19Merge branch 'jc/sha1-name-find-fix' into maintLibravatar Junio C Hamano1-10/+11
2010-08-19autoconf: don't use platform regex if it lacks REG_STARTENDLibravatar Jonathan Nieder2-0/+22
2010-08-19t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTENDLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-08-19compat/regex: get rid of old-style definitionLibravatar Junio C Hamano2-69/+55
2010-08-19t/t9010-svn-fe.sh: add an +x bit to this testLibravatar Ævar Arnfjörð Bjarmason1-0/+0
2010-08-19compat/regex: define out variables only used under RE_ENABLE_I18NLibravatar Ævar Arnfjörð Bjarmason2-1/+3
2010-08-19t9155: fix compatibility with older SVNLibravatar Eric Wong1-1/+1
2010-08-18Merge branch 'sp/fix-smart-http-deadlock-on-error' into maintLibravatar Junio C Hamano1-2/+3
2010-08-18git-gui: ensure correct application termination in git-gui--askpassLibravatar Pat Thoyts1-6/+13
2010-08-18Change regerror() declaration from K&R style to ANSI C (C89)Libravatar Frank Li1-5/+2
2010-08-18compat/regex: get the gawk regex engine to compile within gitLibravatar Ævar Arnfjörð Bjarmason2-0/+7
2010-08-18compat/regex: use the regex engine from gawk for compatLibravatar Ævar Arnfjörð Bjarmason6-5104/+11179
2010-08-18merge script: learn --[no-]rerere-autoupdateLibravatar Jonathan Nieder1-2/+5
2010-08-18merge script: notice @{-1} shorthandLibravatar Jonathan Nieder1-2/+4
2010-08-18merge script: handle --no-ff --no-commit correctlyLibravatar Jonathan Nieder1-2/+10
2010-08-18merge script: --ff-only to disallow true mergeLibravatar Jonathan Nieder1-2/+15
2010-08-18merge script: handle many-way octopusLibravatar Jonathan Nieder1-3/+3
2010-08-18merge script: handle -m --log correctlyLibravatar Jonathan Nieder1-4/+10
2010-08-18merge script: forbid merge -s indexLibravatar Jonathan Nieder1-0/+5
2010-08-18merge script: allow custom strategiesLibravatar Jonathan Nieder1-2/+6
2010-08-18merge script: merge -X<option>Libravatar Jonathan Nieder1-1/+7
2010-08-18merge script: improve log message subjectLibravatar Jonathan Nieder1-8/+19
2010-08-18merge script: refuse to merge during mergeLibravatar Jonathan Nieder1-0/+3
2010-08-18merge script: tweak unmerged files message to match builtinLibravatar Jonathan Nieder1-1/+1
2010-08-18merge script: --squash, --ff from unborn branch are errorsLibravatar Jonathan Nieder1-0/+4
2010-08-18fmt-merge-msg -m to override merge titleLibravatar Jonathan Nieder3-4/+55