summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-01-06Git 1.7.9-rc0v1.7.9-rc0Junio C Hamano2-1/+8
2012-01-06Merge branch 'jc/show-sig'Junio C Hamano16-34/+488
2012-01-06Merge branch 'jm/stash-diff-disambiguate'Junio C Hamano4-31/+80
2012-01-06Merge branch 'jh/fetch-head-update'Junio C Hamano25-102/+114
2012-01-06Merge branch 'pw/p4-view-updates'Junio C Hamano3-82/+564
2012-01-06Sync with 1.7.8.3Junio C Hamano3-5/+24
2012-01-06Git 1.7.8.3v1.7.8.3Junio C Hamano4-3/+22
2012-01-06Merge branch 'jn/maint-gitweb-utf8-fix' into maintJunio C Hamano1-4/+8
2012-01-06Merge branch 'maint-1.7.7' into maintJunio C Hamano1-4/+4
2012-01-06Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano1-4/+4
2012-01-06Documentation: rerere.enabled is the primary way to configure rerereThomas Rast1-4/+4
2012-01-05log --show-signature: reword the common two-head merge caseJunio C Hamano1-0/+12
2012-01-05log-tree: show mergetag in log --show-signature outputJunio C Hamano1-1/+75
2012-01-05log-tree.c: small refactor in show_signature()Junio C Hamano1-12/+16
2012-01-05commit --amend -S: strip existing gpgsig headersJunio C Hamano4-8/+36
2012-01-05verify_signed_buffer: fix stale commentJunio C Hamano1-4/+1
2012-01-05Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'Junio C Hamano15-19/+364
2012-01-04Merge branch 'maint'Junio C Hamano2-4/+7
2012-01-04t5550: repack everything into one fileClemens Buchacher1-2/+1
2012-01-04Merge branch 'nd/maint-parse-depth' into maintJunio C Hamano1-2/+6
2012-01-04Catch invalid --depth option passed to clone or fetchNguyễn Thái Ngọc Duy1-2/+6
2012-01-03write first for-merge ref to FETCH_HEAD firstJoey Hess25-102/+114
2012-01-03git-p4: view spec documentationPete Wyckoff1-13/+27
2012-01-03git-p4: rewrite view handlingPete Wyckoff2-101/+258
2012-01-03git-p4: support single file p4 client view mapsGary Gibbons2-10/+21
2012-01-03git-p4: sort client views by reverse View numberGary Gibbons2-3/+10
2012-01-03git-p4: fix test for unsupported P4 Client ViewsGary Gibbons2-3/+6
2012-01-03git-p4: test client view handlingPete Wyckoff1-0/+290
2012-01-03Merge branch 'pw/p4-docs-and-tests'Junio C Hamano10-343/+830
2012-01-03Merge branch 'maint'Junio C Hamano5-8/+19
2012-01-03Merge branch 'maint-1.7.7' into maintJunio C Hamano3-6/+11
2012-01-03Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2-5/+5
2012-01-03docs: describe behavior of relative submodule URLsJens Lehmann1-1/+6
2012-01-03fix hang in git fetch if pointed at a 0 length bundleBrian Harring2-2/+8
2012-01-01Documentation: read-tree --prefix works with existing subtreesClemens Buchacher1-5/+4
2012-01-01stash: Don't fail if work dir contains file named 'HEAD'Jonathon Mah4-31/+80
2011-12-29Add MYMETA.json to perl/.gitignoreJack Nagel1-0/+1
2011-12-28Update draft release notes to 1.7.9Junio C Hamano1-72/+4
2011-12-28Sync with 1.7.8.2Junio C Hamano2-1/+72
2011-12-28Git 1.7.8.2v1.7.8.2Junio C Hamano3-2/+73
2011-12-28Merge branch 'jv/maint-config-set' into maintJunio C Hamano1-1/+1
2011-12-28Merge branch 'jk/follow-rename-score' into maintJunio C Hamano1-0/+1
2011-12-28Merge branch 'jc/checkout-m-twoway' into maintJunio C Hamano2-24/+85
2011-12-28Merge branch 'tr/doc-sh-setup' into maintJunio C Hamano1-0/+10
2011-12-28Merge branch 'jk/maint-strbuf-missing-init' into maintJunio C Hamano2-2/+2
2011-12-28Merge branch 'jk/maint-push-v-is-verbose' into maintJunio C Hamano1-5/+5
2011-12-28Merge branch 'jk/http-push-to-empty' into maintJunio C Hamano2-3/+36
2011-12-28Merge branch 'jk/doc-fsck' into maintJunio C Hamano1-18/+8
2011-12-28Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maintJunio C Hamano1-10/+50
2011-12-28Merge branch 'ef/setenv-putenv' into maintJunio C Hamano1-2/+8
2011-12-28Merge branch 'jc/advice-doc' into maintJunio C Hamano1-11/+8
2011-12-28Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano6-126/+252
2011-12-28Merge branch 'jk/maint-snprintf-va-copy' into maintJunio C Hamano1-2/+7
2011-12-28Merge branch 'jk/maint-push-over-dav' into maintJunio C Hamano7-5/+49
2011-12-28Merge branch 'jk/maint-mv' into maintJunio C Hamano2-4/+10
2011-12-28Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano8-41/+48
2011-12-28Merge branch 'ew/keepalive' into maintJunio C Hamano1-0/+13
2011-12-28Merge branch 'ci/stripspace-docs' into maintJunio C Hamano2-7/+64
2011-12-28Merge branch 'jh/fast-import-notes' into maintJunio C Hamano2-8/+83
2011-12-28Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano1-13/+23
2011-12-28Merge branch 'tj/maint-imap-send-remove-unused' into maintJunio C Hamano1-1/+0
2011-12-28Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano6-13/+47
2011-12-28Merge branch 'na/strtoimax' into maintJunio C Hamano4-13/+46
2011-12-28Merge branch 'jk/refresh-porcelain-output' into maintJunio C Hamano1-10/+32
2011-12-27Fix an incorrect reference to --set-all.Jelmer Vernooij1-1/+1
2011-12-27git-p4: document and test submit optionsPete Wyckoff3-2/+67
2011-12-27git-p4: test and document --use-client-specPete Wyckoff3-2/+55
2011-12-27git-p4: test --keep-pathPete Wyckoff1-0/+24
2011-12-27git-p4: test --max-changesPete Wyckoff1-0/+10
2011-12-27git-p4: document and test --import-localPete Wyckoff2-1/+25
2011-12-27git-p4: honor --changesfile option and testPete Wyckoff2-1/+38
2011-12-27git-p4: document and test clone --branchPete Wyckoff2-1/+20
2011-12-27git-p4: test cloning with two dirs, clarify docPete Wyckoff2-2/+69
2011-12-27git-p4: clone does not use --git-dirPete Wyckoff2-1/+36
2011-12-27git-p4: introduce asciidoc documentationPete Wyckoff2-302/+455
2011-12-27rename git-p4 testsPete Wyckoff5-0/+0
2011-12-22Update draft release notes in preparation for 1.7.9-rc0Junio C Hamano1-1/+9
2011-12-22Merge branch 'tr/bash-read-unescaped'Junio C Hamano1-6/+6
2011-12-22Merge branch 'ab/sun-studio-portability'Junio C Hamano8-22/+22
2011-12-22Merge branch 'tr/doc-sh-setup'Junio C Hamano1-0/+10
2011-12-22Merge branch 'rr/revert-cherry-pick'Junio C Hamano3-49/+90
2011-12-22Merge branch 'tr/pty-all'Junio C Hamano1-0/+4
2011-12-22Merge branch 'jn/maint-gitweb-utf8-fix'Junio C Hamano1-4/+8
2011-12-22Update draft release notes to 1.7.9Junio C Hamano1-27/+39
2011-12-22Merge branch 'jk/maint-strbuf-missing-init'Junio C Hamano2-2/+2
2011-12-22Merge branch 'jc/maint-lf-to-crlf-keep-crlf'Junio C Hamano1-10/+50
2011-12-22Merge branch 'rs/diff-tree-combined-clean-up'Junio C Hamano5-50/+29
2011-12-22Merge branch 'jk/maint-push-v-is-verbose'Junio C Hamano1-5/+5
2011-12-22Merge branch 'tr/grep-threading'Junio C Hamano4-43/+88
2011-12-22Merge branch 'jk/pretty-reglog-ent'Junio C Hamano5-0/+48
2011-12-22Merge branch 'jk/follow-rename-score'Junio C Hamano1-0/+1
2011-12-22Merge branch 'jk/doc-fsck'Junio C Hamano1-18/+8
2011-12-22Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano10-17/+33
2011-12-22Merge branch 'jk/maint-do-not-feed-stdin-to-tests'Junio C Hamano1-1/+2
2011-12-22Merge branch 'jn/test-cleanup-7006'Junio C Hamano1-56/+17
2011-12-22Merge branch 'ef/setenv-putenv'Junio C Hamano1-2/+8
2011-12-22Merge branch 'jk/git-prompt'Junio C Hamano12-60/+374
2011-12-22Merge branch 'jk/http-push-to-empty'Junio C Hamano2-3/+36
2011-12-21Sync with v1.7.8.1Junio C Hamano5-14/+35
2011-12-21Git 1.7.8.1v1.7.8.1Junio C Hamano1-4/+25
2011-12-21Merge branch 'jl/submodule-status-failure-report' into maintJunio C Hamano1-2/+2
2011-12-21Merge branch 'tr/userdiff-c-returns-pointer' into maintJunio C Hamano1-1/+1
2011-12-21Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano3-6/+25
2011-12-21Merge branch 'cn/maint-lf-to-crlf-filter' into maintJunio C Hamano1-14/+40
2011-12-21Merge branch 'jk/maint-upload-archive' into maintJunio C Hamano2-4/+22
2011-12-21bash completion: use read -r everywhereThomas Rast1-6/+6
2011-12-21clone: the -o option has nothing to do with <branch>Carlos Martín Nieto1-2/+2
2011-12-21builtin/log: remove redundant initializationMichael Schubert1-2/+0
2011-12-21Merge branch 'ms/commit-cc-option-helpstring' into maintJunio C Hamano1-1/+1
2011-12-21builtin/commit: add missing '/' in help messageMichael Schubert1-1/+1
2011-12-21Appease Sun Studio by renaming "tmpfile"Ævar Arnfjörð Bjarmason4-16/+16
2011-12-21Fix a bitwise negation assignment issue spotted by Sun StudioÆvar Arnfjörð Bjarmason3-4/+4
2011-12-21Fix an enum assignment issue spotted by Sun StudioÆvar Arnfjörð Bjarmason1-2/+2
2011-12-20Merge branch 'maint'Junio C Hamano1-1/+1
2011-12-20builtin/init-db.c: eliminate -Wformat warning on SolarisÆvar Arnfjörð Bjarmason1-1/+1
2011-12-20git-sh-setup: make require_clean_work_tree part of the interfaceThomas Rast1-0/+10
2011-12-20Merge branch 'mh/ref-api'Junio C Hamano3-258/+284
2011-12-20Merge branch 'jc/advice-doc'Junio C Hamano1-11/+8
2011-12-20Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2-9/+38
2011-12-20Merge branch 'jc/pull-signed-tag'Junio C Hamano1-1/+5
2011-12-20Merge branch 'jc/checkout-m-twoway'Junio C Hamano1-1/+3
2011-12-20t/t2023-checkout-m.sh: fix use of test_must_failÆvar Arnfjörð Bjarmason1-1/+3
2011-12-20commit: do not lose mergetag header when not amendingJunio C Hamano1-1/+5
2011-12-20Merge branch 'tr/cache-tree'Junio C Hamano1-4/+2
2011-12-20t0090: be prepared that 'wc -l' writes leading blanksJohannes Sixt1-4/+2
2011-12-19Update draft release notes to 1.7.9Junio C Hamano1-1/+48
2011-12-19Merge branch 'ab/enable-i18n'Junio C Hamano37-39/+1291
2011-12-19Merge branch 'ew/keepalive'Junio C Hamano1-0/+13
2011-12-19Merge branch 'jc/checkout-m-twoway'Junio C Hamano2-24/+83
2011-12-19Merge branch 'jk/maint-push-over-dav'Junio C Hamano7-5/+49
2011-12-19Merge branch 'jk/fetch-no-tail-match-refs'Junio C Hamano8-41/+48
2011-12-19Merge branch 'nd/resolve-ref'Junio C Hamano21-76/+73
2011-12-19Merge branch 'jn/maint-sequencer-fixes'Junio C Hamano6-126/+252
2011-12-19Merge branch 'jk/maint-snprintf-va-copy'Junio C Hamano1-2/+7
2011-12-19Merge branch 'jk/maint-mv'Junio C Hamano2-4/+10
2011-12-19Merge branch 'ci/stripspace-docs'Junio C Hamano2-7/+64
2011-12-19Merge branch 'rr/test-chaining'Junio C Hamano15-199/+123
2011-12-19Merge branch 'tr/cache-tree'Junio C Hamano10-11/+144
2011-12-19Merge branch 'jk/credentials'Junio C Hamano28-100/+2427
2011-12-19gitweb: Fix fallback mode of to_utf8 subroutineJakub Narebski1-2/+2
2011-12-19test-terminal: set output terminals to raw modeThomas Rast1-0/+4
2011-12-19request-pull: do not emit "tag" before the tagnameJunio C Hamano2-4/+2
2011-12-19remote-curl: don't pass back fake refsJeff King2-3/+36
2011-12-18advice: Document that they all default to trueJunio C Hamano1-11/+8
2011-12-18lf_to_crlf_filter(): resurrect CRLF->CRLF hackJunio C Hamano1-10/+50
2011-12-18gitweb: Output valid utf8 in git_blame_common('data')Jürgen Kreileder1-1/+3
2011-12-18gitweb: esc_html() site name for title in OPMLJürgen Kreileder1-1/+2
2011-12-18gitweb: Call to_utf8() on input string in chop_and_escape_str()Jürgen Kreileder1-0/+1
2011-12-18Update jk/maint-strbuf-missing-init to builtin/ renameJunio C Hamano1331-35289/+138034
2011-12-18commit, merge: initialize static strbufJeff King2-2/+2
2011-12-17submodule: use diff_tree_combined_merge() instead of diff_tree_combined()René Scharfe1-11/+3
2011-12-17pass struct commit to diff_tree_combined_merge()René Scharfe3-8/+6
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe4-37/+26
2011-12-17git-p4: fix skipSubmitEdit regressionPete Wyckoff2-8/+34
2011-12-17make "git push -v" actually verboseJeff King1-5/+5
2011-12-16Update draft release notes to 1.7.9Junio C Hamano1-1/+18
2011-12-16Merge branch 'jc/commit-amend-no-edit'Junio C Hamano2-156/+172
2011-12-16Merge branch 'jc/stream-to-pack'Junio C Hamano16-134/+516
2011-12-16Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Junio C Hamano1-13/+23
2011-12-16Merge branch 'jh/fast-import-notes'Junio C Hamano2-8/+83
2011-12-16Merge branch 'jk/upload-archive-use-start-command'Junio C Hamano4-36/+19
2011-12-16Merge git://ozlabs.org/~paulus/gitkJunio C Hamano1-45/+65
2011-12-16docs: brush up obsolete bits of git-fsck manpageJeff King1-18/+8
2011-12-16grep: disable threading in non-worktree caseThomas Rast1-18/+18
2011-12-16grep: enable threading with -p and -W using lazy attribute lookupThomas Rast3-33/+63
2011-12-16lf_to_crlf_filter(): tell the caller we added "\n" when drainingJunio C Hamano1-5/+7
2011-12-16pretty: give placeholders to reflog identityJeff King5-0/+48
2011-12-16use custom rename score during --followJeff King1-0/+1
2011-12-16request-pull: update the "pull" command generation logicJunio C Hamano2-9/+40
2011-12-15t3502, t3510: clarify cherry-pick -m failureRamkumar Ramachandra2-2/+2
2011-12-15t3510 (cherry-pick-sequencer): use exit statusRamkumar Ramachandra1-29/+29
2011-12-15revert: simplify getting commit subject in format_todo()Ramkumar Ramachandra1-5/+5
2011-12-15revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra2-6/+23
2011-12-15revert: make commit subjects in insn sheet optionalRamkumar Ramachandra2-21/+44
2011-12-15revert: free msg in format_todo()Ramkumar Ramachandra1-0/+1
2011-12-15commit_tree(): refuse commit messages that contain NULsNguyễn Thái Ngọc Duy2-0/+9
2011-12-15Convert commit_tree() to take strbuf as messageNguyễn Thái Ngọc Duy9-15/+20
2011-12-15merge: abort if fails to commitNguyễn Thái Ngọc Duy1-2/+4
2011-12-15test-lib: redirect stdin of testsJeff King1-1/+2
2011-12-15checkout_merged(): squelch false warning from some gccJunio C Hamano1-1/+1
2011-12-14compat/setenv.c: error if name contains '='Erik Faye-Lund1-1/+1
2011-12-14compat/setenv.c: update errno when erroring outErik Faye-Lund1-2/+8
2011-12-14test: errors preparing for a test are not specialJonathan Nieder1-56/+17
2011-12-13Update draft release notes to 1.7.9Junio C Hamano1-4/+38
2011-12-13Merge branch 'ks/tag-cleanup'Junio C Hamano2-14/+60
2011-12-13Merge branch 'jl/submodule-status-failure-report'Junio C Hamano1-2/+2
2011-12-13Merge branch 'tr/userdiff-c-returns-pointer'Junio C Hamano1-1/+1
2011-12-13Merge branch 'bc/maint-apply-check-no-patch'Junio C Hamano3-6/+25
2011-12-13Merge branch 'nd/ignore-might-be-precious'Junio C Hamano2-7/+16
2011-12-13Merge branch 'jn/branch-move-to-self'Junio C Hamano6-13/+47
2011-12-13Merge branch 'cn/maint-lf-to-crlf-filter'Junio C Hamano1-13/+37
2011-12-13Merge branch 'tj/maint-imap-send-remove-unused'Junio C Hamano1-1/+0
2011-12-13Merge branch 'jk/maint-upload-archive'Junio C Hamano2-4/+22
2011-12-13Merge branch 'jn/gitweb-side-by-side-diff'Junio C Hamano3-89/+353
2011-12-13Merge branch 'maint'Junio C Hamano6-41/+114
2011-12-13Update draft release notes for 1.7.8.1Junio C Hamano2-1/+18
2011-12-13Merge branch 'jc/maint-pack-object-cycle' into maintJunio C Hamano1-12/+43
2011-12-13Merge branch 'jc/index-pack-reject-dups' into maintJunio C Hamano4-2/+11
2011-12-13Merge branch 'mf/curl-select-fdset' into maintJunio C Hamano2-27/+21
2011-12-13Merge branch 'nd/misc-cleanups' into maintJunio C Hamano10-95/+112