summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-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-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
2011-11-28Git 1.7.8-rc4v1.7.8-rc4Junio C Hamano2-2/+2
2011-11-28Allow checkout -B <current-branch> to update the current branchJonathan Nieder5-12/+23
2011-11-28branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2-1/+24
2011-11-28convert: track state in LF-to-CRLF filterCarlos Martín Nieto1-13/+37
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy2-2/+2
2011-11-23Merge branch 'maint' into tj/imap-send-remove-unusedJunio C Hamano2355-53488/+441126
2011-11-23imap-send: Remove unused 'use_namespace' variableThomas Jarosch1-1/+0
2011-11-23builtin-reset: Documentation updateVincent van Ravesteijn1-4/+4
2011-11-23builtin-branch: Fix crash on invalid use of --forceVincent van Ravesteijn1-2/+2
2011-11-23revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2-0/+9
2011-11-23Fix revert --abort on WindowsJohannes Sixt1-2/+2
2011-11-23revert: do not pass non-literal string as format to git_path()Nguyễn Thái Ngọc Duy1-1/+1
2011-11-22Update 1.7.8 draft release notes in preparation for rc4Junio C Hamano1-1/+1
2011-11-22Merge branch 'jn/revert-quit'Junio C Hamano10-54/+314
2011-11-22revert: remove --reset compatibility optionJonathan Nieder2-5/+2
2011-11-22revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder5-3/+185
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder4-3/+61
2011-11-22revert: improve error message for cherry-pick during cherry-pickJonathan Nieder1-7/+6
2011-11-22revert: rearrange pick_revisions() for clarityJonathan Nieder1-24/+24
2011-11-22revert: rename --reset option to --quitJonathan Nieder7-25/+49
2011-11-21Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archiveJunio C Hamano2-4/+22
2011-11-21archive: don't let remote clients get unreachable commitsJeff King5-8/+27
2011-11-21Merge branch 'maint'Junio C Hamano1-1/+1
2011-11-21Merge branch 'rr/misc-fixes'Junio C Hamano1-1/+1
2011-11-21convert.c: Fix return type of git_path_check_eol()Ramsay Jones1-1/+1
2011-11-21documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein1-1/+1
2011-11-20config.c: Fix a static buffer overwrite bug by avoiding mkpath()Ramsay Jones1-2/+2
2011-11-20t5501-*.sh: Fix url passed to clone in setup testRamsay Jones1-1/+1
2011-11-18Hopefully final update of release notes before 1.7.8 finalJunio C Hamano1-1/+1
2011-11-18Merge branch 'rr/misc-fixes'Junio C Hamano4-13/+5
2011-11-18refresh_index: make porcelain output more specificJeff King1-2/+21
2011-11-18refresh_index: rename format variablesJeff King1-6/+6
2011-11-18read-cache: let refresh_cache_ent pass up changed flagsJeff King1-3/+6
2011-11-18Makefile: add option to disable automatic dependency generationJonathan Nieder1-7/+24
2011-11-18Sync with 1.7.7.4Junio C Hamano5-49/+81
2011-11-18Git 1.7.7.4v1.7.7.4Junio C Hamano3-2/+16
2011-11-18Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano1-1/+1
2011-11-18Merge branch 'ml/mailmap' into maintJunio C Hamano1-3/+2
2011-11-18Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano1-43/+61
2011-11-18Makefile: add missing header file dependenciesJonathan Nieder1-2/+3
2011-11-17notes merge: eliminate OUTPUT macroJonathan Nieder1-43/+61
2011-11-17do not let git_path clobber errno when reporting errorsJonathan Nieder2-24/+34
2011-11-17Git 1.7.8-rc3v1.7.8-rc3Junio C Hamano2-5/+2
2011-11-16pack-object: tolerate broken packs that have duplicated objectsJunio C Hamano1-12/+43
2011-11-16receive-pack, fetch-pack: reject bogus pack that records objects twiceJunio C Hamano4-2/+11
2011-11-16refs: loosen over-strict "format" checkJunio C Hamano2-10/+17
2011-11-16mailmap: xcalloc mailmap_infoMarc-André Lureau1-3/+2
2011-11-15revert: prettify fatal messagesRamkumar Ramachandra1-5/+5
2011-11-15git-compat-util: don't assume value for undefined variableRamkumar Ramachandra1-1/+1
2011-11-15sha1_file: don't mix enum with intRamkumar Ramachandra1-1/+1
2011-11-15convert: don't mix enum with intRamkumar Ramachandra1-3/+3
2011-11-15http: remove unused function hex()Ramkumar Ramachandra1-8/+0
2011-11-15name-rev --all: do not even attempt to describe non-commit objectJunio C Hamano1-1/+1
2011-11-15Revert "upload-archive: use start_command instead of fork"Junio C Hamano4-31/+55
2011-11-12Git 1.7.8-rc2v1.7.8-rc2Junio C Hamano2-2/+2
2011-11-11Merge branch 'ly/mktree-using-strbuf'Junio C Hamano1-0/+1
2011-11-10Merge "Move 'builtin-*' into a 'builtin/' subdirectory"Junio C Hamano943-17539/+77997
2011-11-10Merge 'build-in git-mktree'Junio C Hamano1366-45469/+172869
2011-11-10mktree: fix a memory leak in write_tree()Liu Yuan1-0/+1
2011-11-09Merge branch 'sn/complete-bash-wo-process-subst'Junio C Hamano1-1/+1
2011-11-09completion: don't leak variable from the prompt into environmentSZEDER Gábor1-1/+1
2011-11-08Update draft release notes to 1.7.8Junio C Hamano1-14/+5
2011-11-08Merge branch 'jc/remote-setbranches-usage-fix'Junio C Hamano1-1/+1
2011-11-08Merge branch 'fc/remote-seturl-usage-fix'Junio C Hamano1-1/+1
2011-11-08Sync with 1.7.7.3Junio C Hamano5-50/+67
2011-11-08Git 1.7.7.3v1.7.7.3Junio C Hamano3-2/+21
2011-11-08Merge branch 'jc/maint-remove-renamed-ref' into maintJunio C Hamano1-8/+0
2011-11-08Merge branch 'jm/maint-gitweb-filter-forks-fix' into maintJunio C Hamano1-1/+1
2011-11-08Merge branch 'dm/pack-objects-update' into maintJunio C Hamano1-19/+55
2011-11-08docs: Update install-doc-quickJunio C Hamano3-50/+46
2011-11-08docs: don't mention --quiet or --exit-code in git-log(1)Jeff King1-0/+2
2011-11-07Git 1.7.8-rc1v1.7.8-rc1Junio C Hamano2-2/+6
2011-11-07Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano1-4/+3