summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-09-06Merge branch 'maint'v1.7.3-rc0Junio C Hamano3-11/+11
2010-09-06Merge branch 'xx/trivial' into maintJunio C Hamano3-11/+11
2010-09-05tag.c: whitespace breakages fixJunio C Hamano1-9/+9
2010-09-05Fix whitespace issue in object.cJared Hance1-4/+4
2010-09-05t5505: add missing &&Jens Lehmann1-1/+1
2010-09-04Merge branch 'jl/submodule-ignore-diff'Junio C Hamano3-5/+42
2010-09-04Merge branch 'ab/test-2'Junio C Hamano51-559/+968
2010-09-03Merge branch 'js/detached-stash'Junio C Hamano3-83/+268
2010-09-03Merge branch 'js/maint-reflog-beyond-horizon'Junio C Hamano3-9/+29
2010-09-03Merge branch 'dg/local-mod-error-messages'Junio C Hamano7-64/+69
2010-09-03Merge branch 'nd/maint-fix-replace'Junio C Hamano2-2/+2
2010-09-03parse_object: pass on the original sha1, not the replaced oneNguyễn Thái Ngọc Duy2-2/+2
2010-09-03Merge branch 'ab/compat-regex'Junio C Hamano10-5105/+11193
2010-09-03Merge branch 'nd/clone-depth-zero'Junio C Hamano1-2/+5
2010-09-03Merge branch 'jn/maint-doc-user-manual-html-doctype'Junio C Hamano2-2/+5
2010-09-03Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano2-3/+7
2010-09-03Merge branch 'jn/apply-filename-with-sp'Junio C Hamano21-41/+456
2010-09-03Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano2-26/+71
2010-09-03Merge branch 'jc/maint-doc-em-dash'Junio C Hamano7-18/+19
2010-09-03Merge branch 'mg/doc-bundle'Junio C Hamano1-33/+34
2010-09-03Merge branch 'jn/doc-backslash'Junio C Hamano26-59/+64
2010-09-03Merge branch 'jn/update-contrib-example-merge'Junio C Hamano9-562/+701
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano18-170/+785
2010-09-03Sync with 1.7.2.3Junio C Hamano3-9/+6
2010-09-03Git 1.7.2.3v1.7.2.3Junio C Hamano3-9/+3
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina1-1/+4
2010-09-03t7406 & t7407: add missing && at end of linesJens Lehmann2-3/+3
2010-09-03t7405: cd inside subshell instead of aroundJens Lehmann1-11/+6
2010-09-03t7609-merge-co-error-msgs: test non-fast forward case too.Matthieu Moy1-2/+10
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy4-9/+3
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy5-5/+8
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy6-54/+54
2010-09-01Prepare for 1.7.3Junio C Hamano2-1/+74
2010-09-01Merge branch 'maint'Junio C Hamano2-1/+47
2010-09-01Prepare for 1.7.2.3Junio C Hamano2-1/+47
2010-09-01Merge branch 'gp/pack-refs-remove-empty-dirs' into maintJunio C Hamano2-0/+38
2010-09-01Merge branch 'sg/rerere-gc-old-still-used' into maintJunio C Hamano4-11/+41
2010-09-01Merge branch 'np/maint-huge-delta-generation' into maintJunio C Hamano1-1/+8
2010-09-01Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano4-7/+56
2010-09-01Merge branch 'da/fix-submodule-sync-superproject-config' into maintJunio C Hamano2-1/+5
2010-09-01Merge branch 'en/rebase-against-rebase-fix' into maintJunio C Hamano2-0/+71
2010-09-01install-webdoc: filter timestamp-only changes correctlyJunio C Hamano1-1/+1
2010-08-31Merge branch 'np/maint-huge-delta-generation'Junio C Hamano1-1/+8
2010-08-31Merge branch 'da/fix-submodule-sync-superproject-config'Junio C Hamano2-1/+5
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano6-84/+152
2010-08-31Merge branch 'cb/binary-patch-id'Junio C Hamano1-0/+7
2010-08-31Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'Junio C Hamano1-1/+1
2010-08-31Merge branch 'dj/fetch-tagopt'Junio C Hamano4-7/+56
2010-08-31Merge branch 'en/d-f-conflict-fix'Junio C Hamano8-24/+276
2010-08-31Merge branch 'jn/svn-fe'Junio C Hamano31-13/+2108
2010-08-31Merge branch 'tr/maint-no-unquote-plus'Junio C Hamano2-7/+14
2010-08-31Merge branch 'jn/paginate-fix'Junio C Hamano14-47/+120
2010-08-31Merge branch 'jn/maint-setup-fix'Junio C Hamano4-282/+581
2010-08-31Merge branch 'en/fast-export-fix'Junio C Hamano3-1/+30
2010-08-31Merge branch 'hv/autosquash-config'Junio C Hamano4-8/+47
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano4-11/+41
2010-08-31tests: factor HOME=$(pwd) in test-lib.shMatthieu Moy5-13/+3
2010-08-31test-lib: use subshell instead of cd $new && .. && cd $oldÆvar Arnfjörð Bjarmason1-6/+6
2010-08-31tests: simplify "missing PREREQ" messageJonathan Nieder1-1/+7
2010-08-31t/t0000-basic.sh: Run the passing TODO test inside its own test-libÆvar Arnfjörð Bjarmason1-0/+31
2010-08-31test-lib: Allow overriding of TEST_DIRECTORYÆvar Arnfjörð Bjarmason1-1/+7
2010-08-31test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../Ævar Arnfjörð Bjarmason1-14/+15
2010-08-31test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../Ævar Arnfjörð Bjarmason1-8/+8
2010-08-31test: Introduce $GIT_BUILD_DIRThomas Rast1-0/+1
2010-08-31gitweb: Don't die_error in git_tag after already printing headersAnders Kaseorg1-3/+3
2010-08-31t3903: fix broken test_must_fail callsJon Seymour1-18/+18
2010-08-31t1503: fix broken test_must_fail callsJon Seymour1-2/+2
2010-08-30checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesJens Lehmann2-0/+21
2010-08-30checkout: Add test for diff.ignoreSubmodulesJens Lehmann2-1/+9
2010-08-29Merge branch 'maint'Junio C Hamano1-5/+5
2010-08-29Merge branch 'maint-1.7.1' into maintJunio C Hamano1-5/+5
2010-08-29object.h: Add OBJECT_ARRAY_INIT macro and make use of it.Thiago Farina7-6/+8
2010-08-29t0003: add missing && at end of linesMatthieu Moy1-5/+5
2010-08-26Merge branch 'maint'Junio C Hamano4-11/+10
2010-08-26for-each-ref: fix objectname:short bugJay Soffian1-1/+2
2010-08-26Fix compat/regex ANSIfication on MinGWJohannes Sixt1-6/+5
2010-08-25tree-walk: Correct bitrotted comment about tree_entry()Elijah Newren1-1/+4
2010-08-25checkout: respect diff.ignoreSubmodules settingJohannes Schindelin1-4/+12
2010-08-25Fix 'git log' early pager startup error caseLinus Torvalds2-9/+4
2010-08-24Merge branch 'maint'Junio C Hamano2-2/+2
2010-08-24rev-parse: tests git rev-parse --verify master@{n}, for various nJon Seymour2-0/+20
2010-08-24sha1_name.c: use warning in preference to fprintf(stderrJon Seymour1-5/+4
2010-08-24rev-parse: exit with non-zero status if ref@{n} is not valid.Jon Seymour1-4/+5
2010-08-24parse-options: clarify PARSE_OPT_NOARG descriptionJonathan Nieder1-1/+1
2010-08-24t3302 (notes): Port to SolarisJonathan Nieder1-1/+1
2010-08-24t7606: Avoid using head as a file nameBrian Gernhardt1-4/+4
2010-08-24Work around em-dash handling in newer AsciiDocJunio C Hamano7-18/+19
2010-08-24t7610: cd inside subshell instead of aroundBrian Gernhardt1-23/+26
2010-08-24clone: warn users --depth is ignored in local clonesNguyễn Thái Ngọc Duy1-2/+5
2010-08-23git-bundle.txt: Clarify rev-list-args restrictionsMichael J Gruber1-1/+2
2010-08-23git-bundle.txt: whitespace cleanupMichael J Gruber1-28/+28
2010-08-23git-bundle.txt: CleanupMichael J Gruber1-9/+9
2010-08-22Merge branch 'maint'Junio C Hamano17-26/+26
2010-08-22Typos in code comments, an error message, documentationRalf Wildenhues2-2/+2
2010-08-22Typos in code comments, an error message, documentationRalf Wildenhues17-26/+26
2010-08-22autoconf: regex library detection typofixJunio C Hamano1-1/+1
2010-08-21fix >4GiB source delta assertion failureNicolas Pitre1-1/+8
2010-08-21detached-stash: update DocumentationJon Seymour1-5/+11
2010-08-21detached-stash: tests of git stash with stash-like argumentsJon Seymour1-0/+112
2010-08-21detached-stash: simplify git stash showJon Seymour1-12/+2
2010-08-21detached-stash: simplify git stash branchJon Seymour1-10/+7
2010-08-21detached-stash: refactor git stash pop implementationJon Seymour1-4/+8
2010-08-21detached-stash: simplify stash_dropJon Seymour1-28/+3
2010-08-21detached-stash: simplify stash_applyJon Seymour1-35/+3
2010-08-21detached-stash: work around git rev-parse failure to detect bad log refsJon Seymour1-0/+9
2010-08-21detached-stash: introduce parse_flags_and_revs functionJon Seymour1-0/+124
2010-08-21Merge branch 'mm/rebase-i-exec'Junio C Hamano7-11/+174
2010-08-21Merge branch 'gb/split-cmdline-errmsg'Junio C Hamano4-4/+18
2010-08-21Merge branch 'so/http-user-agent'Junio C Hamano3-2/+18
2010-08-21Merge branch 'mm/shortopt-detached'Junio C Hamano7-80/+212
2010-08-21Merge branch 'sr/local-config'Junio C Hamano1-2/+5
2010-08-21Merge branch 'nd/fix-sparse-checkout'Junio C Hamano3-74/+108
2010-08-21Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano10-55/+476
2010-08-21Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2-0/+71
2010-08-21Merge branch 'dg/local-mod-error-messages'Junio C Hamano13-81/+340
2010-08-21Merge branch 'po/userdiff-csharp'Junio C Hamano3-1/+19
2010-08-21Merge branch 'ab/perl-install'Junio C Hamano1-1/+1
2010-08-21reset: suggest what to do upon "git reset --mixed <paths>"Ævar Arnfjörð Bjarmason1-1/+1
2010-08-21Merge branch 'maint'Junio C Hamano2-3/+3
2010-08-21apply: handle traditional patches with space in filenameJonathan Nieder2-16/+181
2010-08-21tests: exercise "git apply" with weird filenamesJonathan Nieder19-0/+213
2010-08-21apply: split quoted filename handling into new functionJonathan Nieder2-33/+70
2010-08-21t7403: add missing &&'sJens Lehmann1-2/+2
2010-08-21Tell ignore file about generate files in /gitweb/staticMark Rada1-1/+1
2010-08-21docs: fix Makefile dependency for user manualJeff King1-1/+1
2010-08-20Documentation: remove stray backslash in show-branch discussionJonathan Nieder1-4/+4
2010-08-20Documentation: remove stray backslashes from "Fighting regressions" articleJonathan Nieder1-1/+1
2010-08-20Documentation: do not convert ... operator to ellipsesJonathan Nieder4-4/+4
2010-08-20Documentation: avoid stray backslash in user manualJonathan Nieder1-2/+2
2010-08-20Documentation: avoid stray backslashes in core tutorialJonathan Nieder1-9/+9
2010-08-20Documentation: remove stray backslashes in rev-parse manualJonathan Nieder1-4/+5
2010-08-20Documentation: remove backslash before ~ in fast-import manualJonathan Nieder1-1/+1
2010-08-20Documentation: remove stray backslash from "git bundle" manualJonathan Nieder1-4/+4
2010-08-20Documentation/technical: avoid stray backslash in parse-options API docsJonathan Nieder1-4/+4
2010-08-20Documentation: remove backslashes in manpage synopsesJonathan Nieder7-10/+10
2010-08-20Documentation: clarify quoting in gitignore docsJonathan Nieder1-2/+2
2010-08-20Documentation: clarify quoting in "git rm" exampleJonathan Nieder1-3/+3
2010-08-20Documentation: add missing quotes to "git grep" examplesJonathan Nieder1-2/+2
2010-08-20Documentation: clarify quoting in "git add" exampleJonathan Nieder1-2/+2
2010-08-20Documentation: unbreak regex in show-ref manualJonathan Nieder2-2/+3
2010-08-20Documentation: quoting trouble in "git rm" discussionJonathan Nieder2-1/+3
2010-08-20Documentation: tweak description of log.dateJonathan Nieder1-4/+5
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey2-3/+7
2010-08-20Merge branch 'maint'Junio C Hamano1-1/+2
2010-08-20Merge branch 'jc/maint-follow-rename-fix' into maintJunio C Hamano5-18/+41
2010-08-20Merge branch 'jn/maint-plug-leak' into maintJunio C Hamano3-3/+13
2010-08-20Merge branch 'jn/fix-abbrev' into maintJunio C Hamano5-4/+3
2010-08-20Merge branch 'vs/doc-spell' into maintJunio C Hamano9-16/+18
2010-08-20Merge branch 'jn/rebase-rename-am' into maintJunio C Hamano5-202/+345
2010-08-20Merge branch 'jn/doc-pull' into maintJunio C Hamano1-11/+54
2010-08-20Merge branch 'bc/use-more-hardlinks-in-install' into maintJunio C Hamano1-3/+12
2010-08-20Merge branch 'tr/rfc-reset-doc' into maintJunio C Hamano1-169/+178
2010-08-20builtin/checkout: Fix message when switching to an existing branchRamkumar Ramachandra1-1/+4
2010-08-20Documentation: set a !DOCTYPE for user manualJonathan Nieder1-1/+4
2010-08-20xmalloc: include size in the failure messageMatthieu Moy1-1/+2
2010-08-20merge-recursive: Avoid excessive output for and reprocessing of renamesElijah Newren1-6/+2
2010-08-19Merge branch 'maint' to sync with 1.7.2.2Junio C Hamano3-2/+25
2010-08-19Git 1.7.2.2v1.7.2.2Junio C Hamano4-3/+26
2010-08-19Merge branch 'tr/xsize-bits' into maintJunio C Hamano1-0/+2
2010-08-19Merge branch 'jc/sha1-name-find-fix' into maintJunio C Hamano1-10/+11
2010-08-19autoconf: don't use platform regex if it lacks REG_STARTENDJonathan Nieder2-0/+22
2010-08-19t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTENDÆvar Arnfjörð Bjarmason1-1/+1
2010-08-19compat/regex: get rid of old-style definitionJunio C Hamano2-69/+55
2010-08-19t/t9010-svn-fe.sh: add an +x bit to this testÆvar Arnfjörð Bjarmason1-0/+0
2010-08-19compat/regex: define out variables only used under RE_ENABLE_I18NÆvar Arnfjörð Bjarmason2-1/+3
2010-08-19t9155: fix compatibility with older SVNEric Wong1-1/+1
2010-08-18Merge branch 'sp/fix-smart-http-deadlock-on-error' into maintJunio C Hamano1-2/+3
2010-08-18Change regerror() declaration from K&R style to ANSI C (C89)Frank Li1-5/+2
2010-08-18compat/regex: get the gawk regex engine to compile within gitÆvar Arnfjörð Bjarmason2-0/+7
2010-08-18compat/regex: use the regex engine from gawk for compatÆvar Arnfjörð Bjarmason6-5104/+11179
2010-08-18merge script: learn --[no-]rerere-autoupdateJonathan Nieder1-2/+5
2010-08-18merge script: notice @{-1} shorthandJonathan Nieder1-2/+4
2010-08-18merge script: handle --no-ff --no-commit correctlyJonathan Nieder1-2/+10
2010-08-18merge script: --ff-only to disallow true mergeJonathan Nieder1-2/+15
2010-08-18merge script: handle many-way octopusJonathan Nieder1-3/+3
2010-08-18merge script: handle -m --log correctlyJonathan Nieder1-4/+10
2010-08-18merge script: forbid merge -s indexJonathan Nieder1-0/+5
2010-08-18merge script: allow custom strategiesJonathan Nieder1-2/+6
2010-08-18merge script: merge -X<option>Jonathan Nieder1-1/+7
2010-08-18merge script: improve log message subjectJonathan Nieder1-8/+19
2010-08-18merge script: refuse to merge during mergeJonathan Nieder1-0/+3
2010-08-18merge script: tweak unmerged files message to match builtinJonathan Nieder1-1/+1
2010-08-18merge script: --squash, --ff from unborn branch are errorsJonathan Nieder1-0/+4
2010-08-18fmt-merge-msg -m to override merge titleJonathan Nieder3-4/+55
2010-08-18merge-base --independent to print reduced parent list in a mergeJonathan Nieder3-7/+62
2010-08-18merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder3-10/+46
2010-08-18Documentation: add a SEE ALSO section for merge-baseJonathan Nieder1-0/+6
2010-08-18t6200 (fmt-merge-msg): style nitpicksJonathan Nieder1-160/+120
2010-08-18t6010 (merge-base): modernize styleJonathan Nieder1-143/+160
2010-08-18t7600 (merge): test merge from branch yet to be bornJonathan Nieder1-0/+21
2010-08-18t7600 (merge): check reflog entryJonathan Nieder1-1/+7
2010-08-18t7600 (merge): do not launch gitk for --debugJonathan Nieder1-29/+29
2010-08-18t7600 (merge): modernize styleJonathan Nieder1-187/+101
2010-08-18merge: do not mistake (ancestor of) tag for branchJonathan Nieder2-5/+13
2010-08-18submodule sync: Update "submodule.<name>.url"David Aguilar2-1/+5
2010-08-18tests: fix syntax error in "Use advise() for hints" testÆvar Arnfjörð Bjarmason1-5/+5
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano5-18/+41
2010-08-18Merge branch 'tf/string-list-init'Junio C Hamano16-31/+36
2010-08-18Merge branch 'cc/find-commit-subject'Junio C Hamano7-49/+62
2010-08-18cvs tests: do not touch test CVS repositories shipped with sourceJunio C Hamano5-11/+9
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 17:12:15 +0000