summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-09-18Git 1.7.7-rc2v1.7.7-rc2Junio C Hamano2-2/+2
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-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-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-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-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-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-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-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
2011-08-23Merge branch 'jc/maint-smart-http-race-upload-pack' into maintJunio C Hamano1-9/+98
2011-08-23Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maintJunio C Hamano1-0/+5
2011-08-23fast-import: allow to tag newly created objectsDmitry Ivankov2-3/+33
2011-08-23fast-import: add tests for tagging blobsDmitry Ivankov2-7/+44
2011-08-23clone: clone from a repository with relative alternatesJunio C Hamano3-25/+78
2011-08-22git-p4: Add simple test case for branch importVitor Antunes1-0/+64
2011-08-22git-p4: Allow branch definition with git configVitor Antunes2-0/+31
2011-08-22git-p4: Allow filtering Perforce branches by userVitor Antunes2-1/+13
2011-08-22git-p4: Correct branch base depot path detectionVitor Antunes1-3/+5
2011-08-22Merge branch 'maint'Junio C Hamano2-1/+82
2011-08-22clone: allow more than one --referenceJunio C Hamano2-8/+39
2011-08-22Show interpreted branch name in error messagesConrad Irwin2-1/+10
2011-08-22Prevent force-updating of the current branchConrad Irwin6-24/+56
2011-08-22add technical documentation about ref iterationHeiko Voigt1-0/+81
2011-08-22clone: allow to clone from .git fileNguyễn Thái Ngọc Duy2-1/+22
2011-08-22read_gitfile_gently(): rename misnamed function to read_gitfile()Junio C Hamano7-11/+11
2011-08-22fast-import: treat cat-blob as a delta base hint for next blobDmitry Ivankov1-1/+6
2011-08-22fast-import: count and report # of calls to diff_delta in statsDmitry Ivankov1-4/+6
2011-08-22git-p4: Process detectCopiesHarder with --boolVitor Antunes1-1/+1
2011-08-22git-p4: Add test case for copy detectionVitor Antunes1-0/+83
2011-08-22git-p4: Add test case for rename detectionVitor Antunes1-0/+53
2011-08-22git-p4: Add description of rename/copy detection optionsVitor Antunes1-0/+25
2011-08-22git-p4: Allow setting rename/copy detection thresholdVitor Antunes1-4/+9
2011-08-22Do not use C++-style commentsMichael Haggerty1-1/+1
2011-08-20push: Don't push a repository with unpushed submodulesFredrik Gustafsson7-0/+231
2011-08-20combine-diff: support format_callbackJunio C Hamano2-1/+70
2011-08-20Use kwset in grepFredrik Kuivinen3-23/+49
2011-08-20Use kwset in pickaxeFredrik Kuivinen2-11/+25
2011-08-20Adapt the kwset code to GitFredrik Kuivinen2-26/+26
2011-08-20Add string search routines from GNU grepFredrik Kuivinen2-0/+834
2011-08-20Add obstack.[ch] from EGLIBC 2.10Fredrik Kuivinen3-0/+952
2011-08-19support pager.* for external commandsJeff King2-0/+38
2011-08-19want_color: automatically fallback to color.uiJeff King9-44/+6
2011-08-19diff: don't load color config in plumbingJeff King3-3/+16
2011-08-19config: refactor get_colorbool functionJeff King1-2/+3
2011-08-19color: delay auto-color decision until point of useJeff King11-19/+59
2011-08-19commit: reduce use of redundant global variablesJunio C Hamano1-42/+45
2011-08-19log: decorate "replaced" on to replaced commitsNguyễn Thái Ngọc Duy1-1/+15
2011-08-19branch.c: use the parsed branch nameMichael J Gruber2-1/+15
2011-08-19mergetools/meld: Use '--output' when availableDavid Aguilar1-1/+24
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar17-333/+369
2011-08-19mergetool--lib: Make style consistent with gitDavid Aguilar1-53/+100
2011-08-19difftool--helper: Make style consistent with gitDavid Aguilar1-6/+12
2011-08-18Update draft release notes to 1.7.7Junio C Hamano1-0/+6
2011-08-18Merge branch 'db/am-skip-blank-at-the-beginning'Junio C Hamano2-3/+26
2011-08-18Merge branch 'ma/am-exclude'Junio C Hamano2-2/+5
2011-08-18Merge branch 'maint'Junio C Hamano1-0/+2
2011-08-18git_config_colorbool: refactor stdout_is_tty handlingJeff King9-29/+27
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King7-34/+29
2011-08-18setup_pager: set GIT_PAGER_IN_USEJeff King2-7/+12
2011-08-18t7006: use test_config helpersJeff King1-21/+18
2011-08-18test-lib: add helper functions for configJeff King1-0/+18
2011-08-18t7006: modernize calls to unsetJeff King1-2/+2
2011-08-18fetch-pack: check for valid commit from serverNguyễn Thái Ngọc Duy1-0/+2
2011-08-18log: decorate grafted commits with "grafted"Nguyễn Thái Ngọc Duy1-0/+12
2011-08-18Move write_shallow_commits to fetch-pack.cNguyễn Thái Ngọc Duy3-19/+30
2011-08-18Add for_each_commit_graft() to iterate all graftsNguyễn Thái Ngọc Duy2-0/+10
2011-08-18decoration: do not mis-decorate refs with same prefixNguyễn Thái Ngọc Duy1-3/+3
2011-08-17Update draft release notes to 1.7.7Junio C Hamano1-1/+34
2011-08-17Merge branch 'mh/check-attr-relative'Junio C Hamano14-115/+322
2011-08-17Merge branch 'js/bisect-no-checkout'Junio C Hamano7-178/+430
2011-08-17Merge branch 'rc/histogram-diff'Junio C Hamano14-285/+655
2011-08-17Merge branch 'jc/maint-smart-http-race-upload-pack'Junio C Hamano1-9/+98
2011-08-17Merge branch 'js/sh-style'Junio C Hamano4-12/+12
2011-08-17Merge branch 'js/ref-namespaces'Junio C Hamano15-24/+326
2011-08-17Merge branch 'cb/maint-quiet-push'Junio C Hamano6-10/+39
2011-08-17Merge branch 'jc/maint-combined-diff-work-tree'Junio C Hamano1-4/+10
2011-08-17Merge branch 'cb/maint-exec-error-report'Junio C Hamano3-17/+33
2011-08-17Merge branch 'maint'Junio C Hamano1-32/+0
2011-08-17Merge branch 'rc/histogram-diff' into HEADJunio C Hamano14-285/+655
2011-08-17xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Tay Ray Chuan1-36/+50
2011-08-17doc/fast-import: document feature import-marks-if-existsDmitry Ivankov2-3/+54
2011-08-17checkout-index: remove obsolete commentNguyễn Thái Ngọc Duy1-32/+0
2011-08-16Sync with "maint"Junio C Hamano1-49/+1