summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-10-23Git 1.7.7.1v1.7.7.1Junio C Hamano2-2/+3
2011-10-23RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile se...Jonathan Nieder1-2/+3
2011-10-21Almost ready for 1.7.7.1Junio C Hamano1-0/+20
2011-10-21Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano7-65/+93
2011-10-21Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano1-2/+9
2011-10-21Merge branch 'jn/no-g-plus-s-on-bsd' into maintJunio C Hamano1-0/+1
2011-10-21Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano3-3/+15
2011-10-21Merge branch 'il/archive-err-signal' into maintJunio C Hamano1-0/+2
2011-10-21Merge branch 'js/maint-merge-one-file-osx-expr' into maintJunio C Hamano1-1/+1
2011-10-21Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2-0/+46
2011-10-21Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2-1/+47
2011-10-21Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2-7/+19
2011-10-18strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()Brandon Casey1-1/+0
2011-10-15Prepare for 1.7.7.1Junio C Hamano2-1/+40
2011-10-15Merge branch 'ms/patch-id-with-overlong-line' into maintJunio C Hamano1-4/+6
2011-10-15Merge branch 'jc/maint-bundle-too-quiet' into maintJunio C Hamano4-5/+10
2011-10-15Merge branch 'jk/filter-branch-require-clean-work-tree' into maintJunio C Hamano1-3/+1
2011-10-15Merge branch 'jc/maint-fsck-fwrite-size-check' into maintJunio C Hamano1-6/+3
2011-10-15Merge branch 'bk/ancestry-path' into maintJunio C Hamano3-10/+101
2011-10-15Merge branch 'jk/maint-fetch-submodule-check-fix' into maintJunio C Hamano1-5/+72
2011-10-15Merge branch 'tr/mergetool-valgrind' into maintJunio C Hamano1-0/+2
2011-10-15Merge branch 'nm/grep-object-sha1-lock' into maintJunio C Hamano1-0/+3
2011-10-15Merge branch 'jc/diff-index-unpack' into maintJunio C Hamano5-6/+38
2011-10-15Merge branch 'mm/rebase-i-exec-edit' into maintJunio C Hamano2-4/+40
2011-10-14t1304: fall back to $USER if $LOGNAME is not definedRené Scharfe1-0/+5
2011-10-12fix "git apply --index ..." not to deref NULLJim Meyering2-0/+46
2011-10-10config: display key_delim for config --bool --get-regexpMatthieu Moy2-7/+19
2011-10-06merge-one-file: fix "expr: non-numeric argument"Jay Soffian1-1/+1
2011-10-05Support ERR in remote archive like in fetch/pushIlari Liusvaara1-0/+2
2011-10-03Makefile: do not set setgid bit on directories on GNU/kFreeBSDJonathan Nieder1-0/+1
2011-10-03diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano2-0/+8
2011-09-30Git 1.7.7v1.7.7Junio C Hamano3-10/+6
2011-09-30checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2-1/+47
2011-09-27templates/hooks--*: remove sample hooks without any functionalityGerrit Pape2-23/+0
2011-09-26contrib/hooks: adapt comment about Debian install location for contrib hooksGerrit Pape1-2/+2
2011-09-26apply --whitespace=error: correctly report new blank lines at endJunio C Hamano1-2/+9
2011-09-26Revert removal of multi-match discard heuristic in 27af01René Scharfe1-3/+7
2011-09-26Merge branch 'jc/namespace-doc-with-old-asciidoc'Junio C Hamano1-0/+7
2011-09-23Git 1.7.7-rc3v1.7.7-rc3Junio C Hamano2-31/+2
2011-09-23Merge 1.7.6.4 inJunio C Hamano2-1/+34
2011-09-23merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano1-1/+1
2011-09-23Git 1.7.6.4v1.7.6.4Junio C Hamano4-3/+36
2011-09-23Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano6-10/+90
2011-09-23describe: Refresh the index when run with --dirtyAllan Caffee1-2/+15
2011-09-23Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano3-30/+114
2011-09-23Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano9-12/+33
2011-09-23Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano3-4/+13
2011-09-23Merge branch 'mg/branch-set-upstream-previous' into maintJunio C Hamano2-1/+15
2011-09-23Merge branch 'gb/maint-am-patch-format-error-message' into maintJunio C Hamano1-1/+2
2011-09-22patch-id.c: use strbuf instead of a fixed bufferMichael Schubert1-4/+6
2011-09-19Merge branch 'maint'Junio C Hamano2-2/+2
2011-09-19git-mergetool: check return value from readJay Soffian2-2/+2
2011-09-19Merge branch 'ph/format-patch-no-color'Junio C Hamano1-4/+4
2011-09-19t4014: clean up format.thread config after each testJeff King1-4/+4
2011-09-19Teach progress eye-candy to fetch_refs_from_bundle()Junio C Hamano4-5/+10
2011-09-18Git 1.7.7-rc2v1.7.7-rc2Junio C Hamano2-2/+2
2011-09-18Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy7-14/+34
2011-09-18merge: remove global variable head[]Nguyễn Thái Ngọc Duy1-44/+53
2011-09-18merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy1-1/+1
2011-09-16Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano5-12/+39
2011-09-16branch --set-upstream: regression fixJunio C Hamano5-12/+39
2011-09-16Disambiguate duplicate t9160* testsFrédéric Heitzmann2-1/+1
2011-09-16Documentation/gitnamespaces.txt: cater to older asciidocJunio C Hamano1-0/+7
2011-09-15filter-branch: use require_clean_work_treeJeff King1-3/+1
2011-09-15t6019: avoid refname collision on case-insensitive systemsThomas Rast1-8/+11
2011-09-14Merge branch 'ph/format-patch-no-color'Junio C Hamano2-1/+10
2011-09-13git-svn: teach git-svn to populate svn:mergeinfoBryan Jacobs4-0/+742
2011-09-12fetch: avoid quadratic loop checking for updated submodulesJeff King1-5/+72
2011-09-12format-patch: ignore ui.colorPang Yan Han2-1/+10
2011-09-12Git 1.7.7-rc1v1.7.7-rc1Junio C Hamano1-1/+1
2011-09-12Sync with 1.7.6.3Junio C Hamano4-7/+19
2011-09-12Merge branch 'jn/remote-helpers-doc'Junio C Hamano3-31/+195
2011-09-12Git 1.7.6.3v1.7.6.3Junio C Hamano3-2/+7
2011-09-12Merge branch 'jl/maint-fetch-submodule-check-fix' into maintJunio C Hamano2-6/+13
2011-09-11Merge branch 'maint'Junio C Hamano2-2/+21
2011-09-11Prepare for 1.7.6.3 maintenance releaseJunio C Hamano2-1/+21
2011-09-11Merge branch 'ms/reflog-show-is-default' into maintJunio C Hamano1-2/+1
2011-09-11Merge branch 'jk/reset-reflog-message-fix' into maintJunio C Hamano2-37/+20
2011-09-11Merge branch 'vi/make-test-vector-less-specific' into maintJunio C Hamano8-13/+13
2011-09-11Merge branch 'jk/tag-contains-ab' (early part) into maintJunio C Hamano1-1/+45
2011-09-11Merge branch 'dz/connect-error-report' into maintJunio C Hamano1-14/+11
2011-09-11Merge branch 'jc/maint-mergetool-read-fix' into maintJunio C Hamano1-4/+4
2011-09-11Merge branch 'jk/maint-config-param' into maintJunio C Hamano4-11/+47
2011-09-11Merge branch 'jn/doc-dashdash' into maintJunio C Hamano9-13/+13
2011-09-11Merge branch 'jk/maint-1.7.2-status-ignored' into maintJunio C Hamano3-2/+128
2011-09-11SubmittingPathces: remove Cogito referenceSverre Rabbelier1-2/+1
2011-09-11fsck: do not abort upon finding an empty blobJunio C Hamano1-6/+3
2011-09-09fetch: skip on-demand checking when no submodules are configuredJens Lehmann2-6/+13
2011-09-07RelNotes/1.7.7: minor fixesMichael J Gruber1-26/+26
2011-09-07Minor update to how-to maintain gitJunio C Hamano1-7/+6
2011-09-06Update draft release notes to 1.7.7Junio C Hamano1-1/+6
2011-09-06Merge branch 'rc/histogram-diff'Junio C Hamano1-0/+2
2011-09-06Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano1-10/+12
2011-09-06Merge branch 'mh/check-ref-format-print-normalize'Junio C Hamano3-4/+13
2011-09-06Sync with 1.7.6.2Junio C Hamano8-41/+21
2011-09-06Git 1.7.6.2v1.7.6.2Junio C Hamano4-4/+13
2011-09-06Revert "Merge branch 'cb/maint-quiet-push' into maint"Junio C Hamano6-39/+10
2011-09-02Update draft release notes to 1.7.7Junio C Hamano1-2/+10
2011-09-02Merge branch 'js/i18n-scripts-2'Junio C Hamano1-35/+14
2011-09-02Merge branch 'tr/maint-t3903-misquoted-command'Junio C Hamano1-1/+1
2011-09-02Merge branch 'bc/bisect-test-use-shell-path'Junio C Hamano1-1/+1
2011-09-02Merge branch 'va/p4-branch-import-test-update'Junio C Hamano1-11/+8
2011-09-02Merge branch 'tr/maint-strbuf-grow-nul-termination'Junio C Hamano1-4/+5
2011-09-02Merge branch 'tr/maint-ident-to-git-memmove'Junio C Hamano1-2/+2
2011-09-02Merge branch 'tr/maint-format-patch-empty-output'Junio C Hamano2-4/+28
2011-09-02Merge branch 'gb/maint-am-stgit-author-to-from-fix'Junio C Hamano1-1/+1
2011-09-02Merge branch 'gb/maint-am-patch-format-error-message'Junio C Hamano2-1/+15
2011-09-02Merge branch 'ms/daemon-timeout-is-in-seconds'Junio C Hamano1-5/+5
2011-09-02Merge branch 'bg/t5540-osx-grep'Junio C Hamano1-2/+6
2011-09-02Merge branch 'jc/clean-exclude-doc'Junio C Hamano2-6/+9
2011-09-02Merge branch 'mg/maint-notes-C-doc'Junio C Hamano1-2/+5
2011-09-02Merge branch 'fg/submodule-ff-check-before-push'Junio C Hamano7-0/+231
2011-09-02Merge branch 'rc/diff-cleanup-records'Junio C Hamano1-37/+51
2011-09-02Merge branch 'fk/use-kwset-pickaxe-grep-f'Junio C Hamano9-34/+1830
2011-09-02Merge branch 'en/merge-recursive-2'Junio C Hamano10-430/+2170
2011-09-01(short) documentation for the testgit remote helperMatthieu Moy3-0/+45
2011-09-01Documentation/git-remote-helpers: explain how import works with multiple refsMatthieu Moy1-1/+21
2011-09-01git-svn: Teach dcommit --mergeinfo to handle multiple linesBryan Jacobs3-2/+19
2011-09-01git-svn: fix fetch with moved path when using rewriteRootEric Wong1-1/+1
2011-09-01git-svn: New flag to emulate empty directoriesRay Chen3-4/+308
2011-08-31xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()Tay Ray Chuan1-0/+2
2011-08-30t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare shBrandon Casey1-1/+1
2011-08-30bisect: take advantage of gettextln, eval_gettextln.Jon Seymour1-35/+14
2011-08-30Merge branch 'maint'Junio C Hamano1-4/+7
2011-08-30Symlink mergetools scriptlets into valgrind wrappersThomas Rast1-0/+2
2011-08-30grep: Fix race condition in delta_base_cacheNicolas Morey-Chaisemartin1-0/+4
2011-08-30t3903: fix misquoted rev-parse invocationThomas Rast1-1/+1
2011-08-30Documentation: clarify effects of -- <path> argumentsThomas Rast1-4/+7
2011-08-29Documentation/remote-helpers: explain capabilities firstJonathan Nieder1-30/+129
2011-08-29strbuf_grow(): maintain nul-termination even for new bufferThomas Rast1-4/+5
2011-08-29Document negated forms of format-patch --to --cc --add-headersThomas Rast1-1/+8
2011-08-29t4014: "no-add-headers" is actually called "no-add-header"Thomas Rast1-2/+2
2011-08-29t4014: invoke format-patch with --stdout where intendedThomas Rast1-2/+2
2011-08-29t4014: check for empty files from git format-patch --stdoutThomas Rast1-2/+19
2011-08-29Use memmove in ident_to_gitThomas Rast1-2/+2
2011-08-29diff-index: pass pathspec down to unpack-trees machineryJunio C Hamano1-0/+1
2011-08-29unpack-trees: allow pruning with pathspecJunio C Hamano2-0/+3
2011-08-29traverse_trees(): allow pruning with pathspecJunio C Hamano2-6/+34
2011-08-29am: fix stgit patch manglingGiuseppe Bilotta1-1/+1
2011-08-29git-p4: simple branch tests editsPete Wyckoff1-11/+8
2011-08-29am: format is in $patch_format, not parse_patchGiuseppe Bilotta1-1/+2
2011-08-28t5540-http-test: shorten grep patternBrian Gernhardt1-2/+6
2011-08-28Documentation: clarify "git clean -e <pattern>"Junio C Hamano2-6/+9
2011-08-28t3005: do not assume a particular order of stdout and stderr of git-ls-filesJohannes Sixt1-10/+12
2011-08-28obstack: Fix portability issuesFredrik Kuivinen3-36/+6
2011-08-28Update draft release notes to 1.7.7Junio C Hamano1-1/+24
2011-08-28Merge branch 'nd/decorate-grafts'Junio C Hamano4-21/+70
2011-08-28Merge branch 'nd/maint-clone-gitdir'Junio C Hamano9-12/+33
2011-08-28Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano6-24/+65
2011-08-28Merge branch 'jk/pager-with-external-command'Junio C Hamano2-0/+38
2011-08-28Merge branch 'jc/maint-clone-alternates'Junio C Hamano3-30/+114
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano21-147/+176
2011-08-28Merge branch 'mh/attr'Junio C Hamano1-50/+63
2011-08-28Merge branch 'di/fast-import-tagging'Junio C Hamano2-7/+74
2011-08-28Merge branch 'di/fast-import-blob-tweak'Junio C Hamano1-5/+12
2011-08-28Merge branch 'di/fast-import-deltified-tree'Junio C Hamano2-5/+71
2011-08-28Merge branch 'di/fast-import-ident'Junio C Hamano5-18/+164
2011-08-28Merge branch 'bw/doc-repo-layout'Junio C Hamano3-31/+34
2011-08-28Merge branch 'va/p4-branch-import'Junio C Hamano3-9/+284
2011-08-28Merge branch 'jc/combine-diff-callback'Junio C Hamano2-1/+70
2011-08-28Merge branch 'nk/branch-v-abbrev'Junio C Hamano2-2/+6
2011-08-28git-daemon.txt: specify --timeout in secondsMichael Stapelberg1-5/+5
2011-08-27Forbid DEL characters in reference namesMichael Haggerty2-1/+4
2011-08-26rebase -i: notice and warn if "exec $cmd" modifies the index or the working treeJunio C Hamano1-3/+9
2011-08-26rebase -i: clean error message for --continue after failed execMatthieu Moy2-1/+31
2011-08-26merge: keep stash[] a local variableNguyễn Thái Ngọc Duy1-17/+16
2011-08-25Git 1.7.7-rc0v1.7.7-rc0Junio C Hamano2-3/+10
2011-08-25log: Do not decorate replacements with --no-replace-objectsMichael J Gruber1-0/+2
2011-08-25revision: do not include sibling history in --ancestry-path outputJunio C Hamano2-7/+11
2011-08-25revision: keep track of the end-user input from the command lineJunio C Hamano2-4/+53
2011-08-25rev-list: Demonstrate breakage with --ancestry-path --allBrad King1-0/+35
2011-08-25Merge branch 'jc/merge-reword'Junio C Hamano2-4/+4
2011-08-25Merge branch 'mg/branch-set-upstream-previous'Junio C Hamano2-1/+15
2011-08-25Merge branch 'da/difftool-mergtool-refactor'Junio C Hamano18-320/+432
2011-08-25Merge branch 'jc/maint-autofix-tag-in-head'Junio C Hamano1-42/+45
2011-08-25Merge branch 'di/fast-import-doc'Junio C Hamano2-3/+54
2011-08-25Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano3-12/+30
2011-08-25Merge branch 'ac/describe-dirty-refresh'Junio C Hamano1-2/+15
2011-08-25Merge branch 'di/parse-options-split'Junio C Hamano6-152/+159
2011-08-25Merge branch 'js/i18n-scripts'Junio C Hamano5-40/+44
2011-08-25Merge branch 'maint'Junio C Hamano5-5/+5
2011-08-25whitespace: have SP on both sides of an assignment "="Junio C Hamano4-4/+4
2011-08-25update-ref: whitespace fixPang Yan Han1-1/+1
2011-08-25check-ref-format --print: Normalize refnames that start with slashesMichael Haggerty2-3/+9
2011-08-25git-notes.txt: clarify -C vs. copy and -FMichael J Gruber1-2/+5
2011-08-24Sync with 1.7.6.1Junio C Hamano2-1/+4
2011-08-24Git 1.7.6.1v1.7.6.1Junio C Hamano2-2/+3
2011-08-24Merge branch 'jc/maint-smart-http-race-upload-pack' into maintJunio C Hamano1-0/+2
2011-08-24get_indexed_object can return NULL if nothing is in that slot; check for itBrian Harring1-0/+2
2011-08-23Mark http-fetch without -a as deprecatedBen Walton2-0/+7
2011-08-23Documentation: Grammar correction, wording fixes and cleanupBen Walton1-31/+27
2011-08-23Update draft release notes to 1.7.7Junio C Hamano1-15/+9
2011-08-23Merge branch 'rt/zlib-smaller-window'Junio C Hamano23-13/+99
2011-08-23Merge branch 'jn/maint-test-return'Junio C Hamano2-9/+13
2011-08-23Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano6-10/+88
2011-08-23Merge branch 'maint'Junio C Hamano1-0/+11
2011-08-23Update draft release notes for 1.7.6.1Junio C Hamano1-0/+11
2011-08-23Merge branch 'jc/maint-combined-diff-work-tree' into maintJunio C Hamano1-4/+10
2011-08-23Merge branch 'cb/maint-exec-error-report' into maintJunio C Hamano3-17/+33
2011-08-23Merge branch 'cb/maint-quiet-push' into maintJunio C Hamano6-10/+39