summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-07-21Git 1.7.2v1.7.2Junio C Hamano3-9/+10
2010-07-21tests: correct "does reflog exist?" testsJunio C Hamano2-49/+11
2010-07-21t/: work around one-shot variable assignment with test_must_failBrandon Casey3-8/+40
2010-07-21t/README: correct an exception when breaking a && chain in testsJonathan Nieder1-4/+4
2010-07-20t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_failBrandon Casey2-2/+2
2010-07-20t/t3700: convert two uses of negation operator '!' to use test_must_failBrandon Casey1-2/+2
2010-07-20Merge branch 'maint'Junio C Hamano2-2/+6
2010-07-20t/README: clarify test_must_fail descriptionBrandon Casey1-0/+8
2010-07-20Check size of path buffer before writing into itGreg Brockman1-0/+2
2010-07-19Merge branch 'maint'Junio C Hamano2-3/+10
2010-07-19update-server-info: Shorten read_pack_info_file()Ralf Thielow1-3/+0
2010-07-19git add: Add --ignore-missing to SYNOPSISÆvar Arnfjörð Bjarmason1-1/+2
2010-07-19git submodule add: Remove old docs about implicit -fÆvar Arnfjörð Bjarmason1-4/+0
2010-07-19git submodule add: Require the new --force option to add ignored pathsJens Lehmann3-15/+35
2010-07-19Merge branch 'jl/add-n-ignore-missing'Junio C Hamano5-6/+47
2010-07-19Documentation: Explain git-mergetool's use of temporary filesDavid Aguilar1-0/+10
2010-07-19git-svn: write memoized data explicitly to avoid Storable bugSergey Vlasov1-0/+16
2010-07-16Merge branch 'jc/diff-merge-base-multi'Junio C Hamano1-13/+0
2010-07-16Only run aggregate-results over actual countsThomas Rast2-2/+2
2010-07-16Add a sample user for the svndump libraryJonathan Nieder4-0/+147
2010-07-16diff A...B: do not limit the syntax too narrowlyJunio C Hamano1-13/+0
2010-07-15Merge branch 'jn/paginate-fix'Junio C Hamano2-46/+200
2010-07-15Merge branch 'wp/merge-tree-fix'Junio C Hamano2-1/+259
2010-07-15Merge branch 'js/merge-rr-fix'Junio C Hamano2-3/+3
2010-07-15Merge branch 'jc/diff-merge-base-multi'Junio C Hamano1-8/+23
2010-07-15Merge branch 'ns/merge-recursive-uptodate'Junio C Hamano1-1/+1
2010-07-15Merge branch 'jn/tests'Junio C Hamano1-47/+42
2010-07-15Merge branch 'eb/doc-log-manpage'Junio C Hamano1-6/+9
2010-07-15Merge branch 'jn/grep-open'Junio C Hamano2-0/+16
2010-07-15Merge branch 'mg/revision-doc'Junio C Hamano20-222/+257
2010-07-15Merge branch 'jk/maint-status-keep-index-timestamp'Junio C Hamano1-5/+11
2010-07-15Merge branch 'jc/rebase-i-commit-msg-fix'Junio C Hamano2-9/+28
2010-07-15Merge branch 'ab/submodule-add-f'Junio C Hamano3-3/+29
2010-07-15Merge branch 'bc/maint-makefile-fixes'Junio C Hamano1-5/+5
2010-07-15Merge branch 'maint'Junio C Hamano3-2/+13
2010-07-15Documentation: add submodule.* to the big configuration variable listJonathan Nieder1-0/+9
2010-07-15gitmodules.5: url can be a relative pathJonathan Nieder1-0/+3
2010-07-15gitweb: fix esc_urlPavan Kumar Sunkara1-2/+1
2010-07-14git --paginate: paginate external commands againJonathan Nieder2-12/+38
2010-07-14MERGE_RR is in .git, not .git/rr-cacheJay Soffian2-3/+3
2010-07-14merge-tree: fix where two branches share no changesWill Palmer2-4/+5
2010-07-14add basic tests for merge-treeWill Palmer1-0/+257
2010-07-14Git 1.7.2-rc3v1.7.2-rc3Junio C Hamano1-1/+4
2010-07-14Merge branch 'jc/read-tree-cache-tree-fix'Junio C Hamano2-5/+16
2010-07-14Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()Raja R Harinath1-1/+2
2010-07-13diff A...B: give one possible diff when there are more than one merge-baseJunio C Hamano1-8/+23
2010-07-13Merge branch 'maint'Junio C Hamano2-2/+5
2010-07-13git fetch documentation: describe short '-p' synonym to '--prune' optionOren Held1-0/+1
2010-07-13format-patch: document the format.to configuration settingMiklos Vajna1-2/+4
2010-07-12git add: Add the "--ignore-missing" option for the dry runJens Lehmann5-6/+47
2010-07-12test-lib: TAP compliance for skipping tests on requestMichael J Gruber1-2/+2
2010-07-12test-lib: simplify GIT_SKIP_TESTS loopMichael J Gruber1-10/+3
2010-07-11Merge branch 'maint'Junio C Hamano3-2/+3
2010-07-11t3000 (ls-files -o): modernize styleJonathan Nieder1-47/+42
2010-07-09Documentation: Spelling fix in protocol-capabilities.txtFredrik Skolmli1-1/+1
2010-07-09merge-recursive: use "up-to-date" instead of "uptodate" in error message for ...Nicolas Sebrecht1-1/+1
2010-07-09checkout: accord documentation to what git doesNicolas Sebrecht1-1/+1
2010-07-09t0005: work around strange $? in ksh when program terminated by a signalJohannes Sixt1-0/+1
2010-07-08Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fixJunio C Hamano997-17105/+82957
2010-07-08diff.c: fix a graph output bugBo Yang1-2/+1
2010-07-08tests: Use skip_all=* to skip testsÆvar Arnfjörð Bjarmason7-18/+17
2010-07-08Fix "read-tree -m A B" priming the cache-treeJunio C Hamano2-5/+16
2010-07-08Reorganize `git-log' man page to clarify common diff options.Eli Barzilay1-6/+9
2010-07-08t9118 (git-svn): prevent early failure from taking down later testsJonathan Nieder1-21/+25
2010-07-08t9118: avoid PEG revision identifier in testsMichael J Gruber1-1/+1
2010-07-07grep -O: Do not pass color sequences as filenames to pagerNazri Ramliy2-0/+16
2010-07-07Git 1.7.2-rc2v1.7.2-rc2Junio C Hamano1-14/+4
2010-07-07Merge branch 'ab/tap'Junio C Hamano46-111/+369
2010-07-07Merge branch 'maint'Junio C Hamano4-8/+54
2010-07-07backmerge a few more fixes to 1.7.1.X seriesJunio C Hamano2-1/+20
2010-07-07Merge branch 'maint-1.6.4' into maintJunio C Hamano2-2/+20
2010-07-07rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-optionUwe Kleine-König2-2/+20
2010-07-07Merge branch 'mg/doc-rev-parse-treepath-syntax' into maintJunio C Hamano1-6/+9
2010-07-07Merge branch 'tr/receive-pack-aliased-update-fix' into maintJunio C Hamano2-37/+140
2010-07-07fix git branch -m in presence of cross devicesPierre Habouzit1-6/+15
2010-07-07t/t0006: specify timezone as EST5 not EST to comply with POSIXBrandon Casey1-1/+1
2010-07-06do not write out index when status does not have toJunio C Hamano1-5/+11
2010-07-06Merge branch 'maint'Junio C Hamano2-3/+3
2010-07-06add missing && to submodule-merge testcaseHeiko Voigt1-1/+1
2010-07-06t/README: document more test helpersJonathan Nieder1-0/+31
2010-07-06Makefile: work around ksh's failure to handle missing list argument to for loopBrandon Casey1-3/+3
2010-07-06test-date: fix sscanf type conversionJeff King1-2/+2
2010-07-05Merge branch 'maint'Junio C Hamano1-1/+3
2010-07-05xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid1-1/+3
2010-07-05rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano2-5/+23
2010-07-05rebase-i: style fixJunio C Hamano1-5/+6
2010-07-05Documentation: link to gitrevisions rather than git-rev-parseMichael J Gruber16-22/+21
2010-07-05Documentation: gitrevisionsMichael J Gruber2-1/+36
2010-07-05Documentation: split off rev doc into include fileMichael J Gruber2-199/+200
2010-07-05gitweb: Move evaluate_gitweb_config out of run_requestJakub Narebski1-6/+11
2010-07-05parse_date: fix signedness in timezone calculationJeff King2-1/+2
2010-07-05Merge branch 'maint'Junio C Hamano4-6/+22
2010-07-05t0006: test timezone parsingJeff King2-5/+9
2010-07-05git submodule: add submodules with git add -f <path>Ævar Arnfjörð Bjarmason3-3/+29
2010-07-05rerere.txt: Document forget subcommandMichael J Gruber1-1/+6
2010-07-05t/README: proposed rewording...Junio C Hamano1-13/+8
2010-07-05t/README: Document the do's and don'ts of testsÆvar Arnfjörð Bjarmason1-0/+78
2010-07-05t/README: Add a section about skipping testsÆvar Arnfjörð Bjarmason1-0/+12
2010-07-05t/README: Document test_expect_codeÆvar Arnfjörð Bjarmason1-0/+7
2010-07-05t/README: Document test_external*Ævar Arnfjörð Bjarmason1-0/+27
2010-07-05t/README: Document the prereq functions, and 3-arg test_*Ævar Arnfjörð Bjarmason1-3/+34
2010-07-05t/README: Typo: paralell -> parallelÆvar Arnfjörð Bjarmason1-1/+1
2010-07-05t/README: The trash is in 't/trash directory.$name'Ævar Arnfjörð Bjarmason1-3/+4
2010-07-05Makefile: remove some unnecessary curly bracesBrandon Casey1-4/+4
2010-07-02Documentation/git-gc.txt: add reference to githooksChris Packham1-0/+7
2010-07-02Updates from the list to 1.7.2 Release NotesJunio C Hamano1-12/+14
2010-06-30Git 1.7.2-rc1v1.7.2-rc1Junio C Hamano2-5/+12
2010-06-30git.spec.in: Add gitweb subpackageJunio C Hamano1-0/+15
2010-06-30Merge branch 'ar/decorate-color'Junio C Hamano6-8/+176
2010-06-30Merge branch 'mg/doc-rev-parse-treepath-syntax'Junio C Hamano1-6/+9
2010-06-30Merge branch 'cc/cherry-pick-stdin'Junio C Hamano4-25/+61
2010-06-30Merge branch 'jl/status-ignore-submodules'Junio C Hamano9-16/+177
2010-06-30Merge branch 'jk/url-decode'Junio C Hamano1-4/+4
2010-06-30Merge branch 'jn/grep-open'Junio C Hamano7-39/+276
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano29-147/+147
2010-06-30Merge branch 'tr/rev-list-count'Junio C Hamano6-1/+204
2010-06-30Merge branch 'as/maint-completion-set-u-fix'Junio C Hamano1-7/+7
2010-06-30Merge branch 'mg/rev-parse-tests'Junio C Hamano1-1/+16
2010-06-30Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano5-5/+116
2010-06-30Add test for correct coloring of git log --decorationNazri Ramliy1-0/+66
2010-06-29Sync with 1.7.1.1Junio C Hamano2-13/+6
2010-06-29revert: do not rebuild argv on heapJonathan Nieder2-16/+34
2010-06-29Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdinJunio C Hamano4-2/+13
2010-06-29Git 1.7.1.1v1.7.1.1Junio C Hamano2-11/+4
2010-06-29t/t9700/test.pl: don't access private object members, use public access methodsBrandon Casey1-3/+3
2010-06-29t/t9001: use egrep when regular expressions are involvedBrandon Casey1-3/+3
2010-06-29git-rev-parse.txt: Add more examples for caret and colonMichael J Gruber1-7/+8
2010-06-28Merge branch 'maint'Junio C Hamano4-2/+27
2010-06-28Update draft release notes to 1.7.1.1Junio C Hamano1-1/+16
2010-06-28Merge branch 'tr/send-email-8bit' into maintJunio C Hamano3-0/+146
2010-06-28Merge branch 'pb/maint-perl-errmsg-no-dir' into maintJunio C Hamano1-2/+2
2010-06-28Merge branch 'js/maint-am-rebase-invalid-author' into maintJunio C Hamano2-6/+17
2010-06-28Merge branch 'jc/maint-simpler-common-prefix' into maintJunio C Hamano1-13/+13
2010-06-28Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maintJunio C Hamano1-2/+10
2010-06-28git --paginate: do not commit pager choice too earlyNguyễn Thái Ngọc Duy2-13/+47
2010-06-28tests: local config file should be honored from subdirs of toplevelJonathan Nieder1-0/+26
2010-06-28t7006: test pager configuration for several git commandsJonathan Nieder1-52/+84
2010-06-28t7006 (pager): introduce helper for parameterized testsJonathan Nieder1-18/+54
2010-06-28notes: Initialise variable to appease gccRamsay Jones1-1/+1
2010-06-28notes: check number of parameters to "git notes copy"Jeff King2-0/+10
2010-06-27msvc: Select the "fast" definition of the {get,put}_be32() macrosRamsay Jones1-0/+1
2010-06-27git-rev-parse.txt: Document ":path" specifierMichael J Gruber1-1/+3
2010-06-27Git 1.7.2-rc0v1.7.2-rc0Junio C Hamano1-1/+11
2010-06-27Merge branch 'cp/textconv-cat-file'Junio C Hamano7-15/+155
2010-06-27Merge branch 'pb/maint-perl-errmsg-no-dir'Junio C Hamano1-2/+2
2010-06-27Merge branch 'tr/send-email-8bit'Junio C Hamano3-0/+146
2010-06-27Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2-6/+17
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano4-21/+165
2010-06-27Merge branch 'jn/show-num-walks'Junio C Hamano1-0/+4
2010-06-27t6018: make sure all tested symbolic names are different revsMichael J Gruber1-1/+3
2010-06-27t6018: add tests for rev-list's --branches and --tagsMichael J Gruber1-0/+13
2010-06-27t9700: Use Test::More->builder, not $Test::Builder::TestÆvar Arnfjörð Bjarmason1-4/+5
2010-06-27Merge branch 'jp/string-list-api-cleanup' into jn/grep-openJulian Phillips30-150/+150
2010-06-27string_list: Fix argument order for string_list_appendJulian Phillips16-64/+64
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips11-17/+17
2010-06-27string_list: Fix argument order for string_list_insert_at_indexJulian Phillips3-6/+6
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips19-40/+40
2010-06-27string_list: Fix argument order for for_each_string_listJulian Phillips7-18/+18
2010-06-27string_list: Fix argument order for print_string_listJulian Phillips2-2/+2
2010-06-25Merge branch 'maint'Junio C Hamano5-10/+10
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann8-13/+174
2010-06-25git submodule: ignore dirty submodules for summary and statusJens Lehmann1-3/+3
2010-06-25msvc: Fix some compiler warningsRamsay Jones1-4/+4
2010-06-25t4027,4041: Use test -s to test for an empty fileBrian Gernhardt2-13/+13
2010-06-25tests: Say "pass" rather than "ok" on empty lines for TAPÆvar Arnfjörð Bjarmason3-13/+13
2010-06-25tests: Skip tests in a way that makes sense under TAPÆvar Arnfjörð Bjarmason40-54/+56
2010-06-25test-lib: output a newline before "ok" under a TAP harnessÆvar Arnfjörð Bjarmason1-0/+3
2010-06-25test-lib: Make the test_external_* functions TAP-awareÆvar Arnfjörð Bjarmason3-12/+53
2010-06-25test-lib: Adjust output to be valid TAP formatÆvar Arnfjörð Bjarmason2-30/+59
2010-06-25Documentation: grep: fix asciidoc problem with --Christian Couder1-1/+1
2010-06-25revert: accept arbitrary rev-list optionsChristian Couder3-1/+19
2010-06-24url_decode: URL scheme ends with a colon and does not require a slashJunio C Hamano1-4/+4
2010-06-24git-cat-file.txt: Document --textconvMichael J Gruber1-2/+8
2010-06-24Allow customizable commit decorations colorsNazri Ramliy4-0/+45
2010-06-24bash completion: Support "divergence from upstream" messages in __git_ps1Andrew Sayers1-1/+143
2010-06-24msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones3-5/+5
2010-06-23Merge branch 'jk/url-decode'Junio C Hamano1-10/+18
2010-06-23url.c: "<scheme>://" part at the beginning should not be URL decodedJunio C Hamano1-10/+18
2010-06-22Update draft release notes to 1.7.2Junio C Hamano1-12/+41
2010-06-22Merge branch 'jc/maint-simpler-common-prefix'Junio C Hamano1-13/+13
2010-06-22Merge branch 'sb/format-patch-signature'Junio C Hamano6-4/+85
2010-06-22Merge branch 'mg/pretty-magic-space'Junio C Hamano3-4/+25
2010-06-22Merge branch 'jn/gitweb-return-or-exit-cleanup'Junio C Hamano1-0/+9
2010-06-22Merge branch 'bd/maint-unpack-trees-parawalk-fix'Junio C Hamano1-2/+10
2010-06-22Merge branch 'cc/cherry-pick-series'Junio C Hamano4-66/+264
2010-06-22Merge branch 'jc/rev-list-ancestry-path'Junio C Hamano4-3/+226
2010-06-22Merge branch 'lt/extended-sha1-match-commit-with-regexp'Junio C Hamano1-3/+9
2010-06-22Merge branch 'maint'Junio C Hamano4-4/+24
2010-06-22Update draft release notes to 1.7.1.1Junio C Hamano1-0/+21
2010-06-22Merge branch 'ic/maint-rebase-i-abort' into maintJunio C Hamano2-1/+12
2010-06-22Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2-6/+13
2010-06-22Merge branch 'jk/maint-advice-empty-amend' into maintJunio C Hamano1-0/+7
2010-06-22Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2-6/+72
2010-06-22Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2-0/+33
2010-06-22Merge branch 'jn/checkout-doc' into maintJunio C Hamano1-23/+31
2010-06-22Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano3-5/+98
2010-06-22Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano1-7/+13
2010-06-22Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano4-71/+110
2010-06-22Merge branch 'tc/merge-m-log' into maintJunio C Hamano5-41/+87
2010-06-22Merge branch 'ph/clone-message-reword' into maintJunio C Hamano1-1/+2