summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-04-26Git 1.7.8.6v1.7.8.6Junio C Hamano4-3/+27
2012-04-26Sync with 1.7.7.7Junio C Hamano3-2/+16
2012-04-26Git 1.7.7.7v1.7.7.7Junio C Hamano4-3/+18
2012-04-26bundle: remove stray single-quote from error messageJonathan Nieder1-1/+1
2012-04-09Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Junio C Hamano1-4/+4
2012-04-09Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Junio C Hamano1-2/+2
2012-04-09Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano10-11/+142
2012-04-09Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Junio C Hamano2-4/+33
2012-04-09Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Junio C Hamano1-6/+6
2012-04-09Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Junio C Hamano2-23/+36
2012-04-09Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Junio C Hamano5-51/+67
2012-04-09Merge branch 'ph/rerere-doc' into maint-1.7.8Junio C Hamano1-7/+12
2012-03-23Documentation/gitweb: trivial English fixesD Waitzman1-2/+2
2012-03-20Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8Junio C Hamano1-3/+3
2012-03-20Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2-12/+20
2012-03-20Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8Junio C Hamano2-1/+11
2012-03-15fetch/receive: remove over-pessimistic connectivity checkJunio C Hamano1-4/+4
2012-03-08rerere: Document 'rerere remaining'Phil Hord1-7/+12
2012-03-06Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano1-0/+3
2012-03-06Document the --histogram diff optionThomas Rast1-0/+3
2012-03-01bundle: keep around names passed to add_pending_object()Thomas Rast2-1/+16
2012-03-01t5510: ensure we stay in the toplevel test dirThomas Rast1-8/+10
2012-03-01t5510: refactor bundle->pack conversionThomas Rast1-14/+10
2012-02-28Documentation: use {asterisk} in rev-list-options.txt when neededCarlos Martín Nieto1-6/+6
2012-02-26Git 1.7.8.5v1.7.8.5Junio C Hamano3-2/+21
2012-02-26grep -P: Fix matching ^ and $Michał Kiedrowicz1-1/+1
2012-02-26am: don't infloop for an empty input fileJim Meyering2-1/+11
2012-02-26rebase -m: only call "notes copy" when rewritten exists and is non-emptyAndrew Wong1-4/+7
2012-02-26Makefile: add thread-utils.h to LIB_HDmitry V. Levin1-0/+1
2012-02-23t5704: match tests to modern styleThomas Rast1-25/+8
2012-02-23strbuf: improve strbuf_get*line documentationThomas Rast1-1/+17
2012-02-23bundle: use a strbuf to scan the log for boundary commitsThomas Rast2-7/+24
2012-02-22bundle: put strbuf_readline_fd in strbuf.c with adjustmentsThomas Rast3-19/+19
2012-02-13t5541: check error message against the real port number usedClemens Buchacher1-1/+1
2012-02-05Sync with 1.7.6.6Junio C Hamano2-24/+2
2012-02-05Sync with 1.7.6.6Junio C Hamano2-24/+2
2012-02-05Git 1.7.6.6v1.7.6.6Junio C Hamano2-2/+3
2012-02-05imap-send: remove dead codeJeff King1-23/+0
2012-01-22t/Makefile: Use $(sort ...) explicitly where neededKirill Smelkov1-3/+3
2012-01-20remote-curl: Fix push status report when all branches failShawn O. Pearce2-4/+33
2012-01-18Git 1.7.8.4v1.7.8.4Junio C Hamano3-3/+9
2012-01-18Merge branch 'maint-1.7.7' into maintJunio C Hamano3-0/+14
2012-01-18Git 1.7.7.6v1.7.7.6Junio C Hamano2-1/+5
2012-01-18diff-index: enable recursive pathspec matching in unpack_treesNguyen Thai Ngoc Duy2-0/+10
2012-01-12Update draft release notes to 1.7.8.4Junio C Hamano1-0/+5
2012-01-12Merge branch 'maint-1.7.7' into maintJunio C Hamano3-2/+17
2012-01-12Update draft release notes to 1.7.7.6Junio C Hamano1-0/+5
2012-01-12Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2-2/+12
2012-01-12Update draft release notes to 1.7.6.6Junio C Hamano1-0/+5
2012-01-12thin-pack: try harder to use preferred base objects as baseJeff King1-2/+7
2012-01-11Merge branch 'maint-1.7.7' into maintJunio C Hamano2-1/+2
2012-01-11Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2-1/+2
2012-01-11attr: fix leak in free_attr_elemJeff King1-0/+1
2012-01-11t2203: fix wrong commit commandNguyễn Thái Ngọc Duy1-1/+1
2012-01-10Prepare for 1.7.8.4Junio C Hamano2-1/+15
2012-01-10Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano5-33/+77
2012-01-10Prepare for 1.7.7.6Junio C Hamano2-1/+12
2012-01-10Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano4-33/+66
2012-01-10Prepare for 1.7.6.6Junio C Hamano2-1/+12
2012-01-10Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano1-1/+2
2012-01-10attr.c: clarify the logic to pop attr_stackJunio C Hamano1-1/+10
2012-01-10attr.c: make bootstrap_attr_stack() leave earlyJunio C Hamano1-30/+31
2012-01-10attr: drop misguided defensive codingJeff King1-1/+1
2012-01-10attr: don't confuse prefixes with leading directoriesJeff King2-1/+12
2012-01-09send-email: multiedit is a boolean config optionJeff King1-1/+1
2012-01-09gitweb: Fix actionless dispatch for non-existent objectsJakub Narebski2-1/+11
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-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-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
2011-12-29Add MYMETA.json to perl/.gitignoreJack Nagel1-0/+1
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-22i18n of multi-line advice messagesJunio C Hamano2-12/+20
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-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-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-20t/t2023-checkout-m.sh: fix use of test_must_failÆvar Arnfjörð Bjarmason1-1/+3
2011-12-20t0090: be prepared that 'wc -l' writes leading blanksJohannes Sixt1-4/+2
2011-12-19gitweb: Fix fallback mode of to_utf8 subroutineJakub Narebski1-2/+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-17make "git push -v" actually verboseJeff King1-5/+5
2011-12-16docs: brush up obsolete bits of git-fsck manpageJeff King1-18/+8
2011-12-16lf_to_crlf_filter(): tell the caller we added "\n" when drainingJunio C Hamano1-5/+7
2011-12-16use custom rename score during --followJeff King1-0/+1
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-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
2011-12-13Merge branch 'maint-1.7.7' into maintJunio C Hamano10-48/+101
2011-12-13Git 1.7.7.5v1.7.7.5Junio C Hamano4-3/+21
2011-12-13Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano3-5/+2
2011-12-13Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2-2/+2
2011-12-13Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano4-40/+78
2011-12-13Git 1.7.6.5v1.7.6.5Junio C Hamano4-3/+30
2011-12-13Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano1-38/+49
2011-12-13Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano1-1/+1
2011-12-13Merge branch 'ml/mailmap' into maint-1.7.6Junio C Hamano1-3/+2
2011-12-13blame: don't overflow time bufferJeff King1-1/+1
2011-12-13http-push: enable "proactive auth"Jeff King6-6/+13
2011-12-13t5540: test DAV push with authenticationJeff King2-0/+37
2011-12-13connect.c: drop path_match functionJeff King2-22/+0
2011-12-13fetch-pack: match refs exactlyJeff King2-4/+38
2011-12-13t5500: give fully-qualified refs to fetch-packJeff King1-3/+3
2011-12-13drop "match" parameter from get_remote_headsJeff King6-12/+7
2011-12-12Update documentation for stripspaceConrad Irwin2-7/+64
2011-12-12mv: be quiet about overwritingJeff King1-1/+2
2011-12-12mv: improve overwrite warningJeff King1-1/+1
2011-12-12revert: stop creating and removing sequencer-old directoryJonathan Nieder3-21/+7
2011-12-12Revert "reset: Make reset remove the sequencer state"Jonathan Nieder3-55/+1
2011-12-12revert: do not remove state until sequence is finishedJonathan Nieder2-14/+4
2011-12-12revert: allow single-pick in the middle of cherry-pick sequenceJonathan Nieder2-0/+38
2011-12-12revert: pass around rev-list args in already-parsed formJonathan Nieder2-24/+34
2011-12-12revert: allow cherry-pick --continue to commit before resumingJonathan Nieder2-6/+156
2011-12-12revert: give --continue handling its own functionJonathan Nieder1-11/+17
2011-12-12mv: make non-directory destination error more clearJeff King1-1/+1
2011-12-12mv: honor --verbose flagJeff King2-2/+7
2011-12-12docs: mention "-k" for both forms of "git mv"Jeff King1-1/+1
2011-12-12compat/snprintf: don't look at va_list twiceJeff King1-2/+7
2011-12-11Test 'checkout -m -- path'Pete Harlan1-0/+47
2011-12-09fetch: create status table using strbufJeff King1-38/+49
2011-12-09Merge branch 'maint-1.7.7' into maintJunio C Hamano4-15/+5
2011-12-09am: don't persist keepcr flagMartin von Zweigbergk1-7/+0
2011-12-09mingw: give waitpid the correct signatureErik Faye-Lund2-2/+2
2011-12-08diff/status: print submodule path when looking for changes failsJens Lehmann1-2/+2
2011-12-08git symbolic-ref: documentation fixMichael Haggerty1-6/+3
2011-12-06reset: update cache-tree data when appropriateThomas Rast2-2/+9
2011-12-06commit: write cache-tree data when writing index anywayThomas Rast2-1/+3
2011-12-06Refactor cache_tree_update idiom from commitThomas Rast5-11/+21
2011-12-06Test the current state of the cache-tree optimizationThomas Rast1-0/+95
2011-12-06Add test-scrap-cache-treeThomas Rast3-0/+19
2011-12-06checkout -m: no need to insist on having all 3 stagesJunio C Hamano1-24/+36
2011-12-06userdiff: allow * between cpp funcname wordsThomas Rast1-1/+1
2011-12-05enable SO_KEEPALIVE for connected TCP socketsEric Wong1-0/+13
2011-12-05Merge branch 'maint-1.7.7' into maintJunio C Hamano2-2/+1
2011-12-05Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2-2/+1
2011-12-05stripspace: fix outdated commentJeff King1-2/+0
2011-12-05Add MYMETA.yml to perl/.gitignoreSebastian Morr1-0/+1
2011-12-05builtin/apply.c: report error on failure to recognize inputBrandon Casey2-5/+24
2011-12-05t/t4131-apply-fake-ancestor.sh: fix broken testBrandon Casey1-1/+1
2011-12-05Merge branch 'js/merge-edit-option'Junio C Hamano1-1/+0
2011-12-05Documentation: fix formatting error in merge-options.txtJack Nagel1-1/+0
2011-12-02Git 1.7.8v1.7.8Junio C Hamano3-11/+8
2011-11-30rebase -i: interrupt rebase when "commit --amend" failed during "reword"Andrew Wong1-13/+23
2011-11-28fast-import: Fix incorrect fanout level when modifying existing notes refsJohan Herland2-7/+29
2011-11-28t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handlingJohan Herland1-0/+54
2011-11-28t9301: Fix testcase covering up a bug in fast-import's notes fanout handlingJohan Herland1-7/+6