summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-07-22Git 1.8.3.4v1.8.3.4Junio C Hamano2-2/+3
2013-07-22update URL to the marc.info mail archiveOndřej Bílka3-4/+4
2013-07-21Update draft release notes to 1.8.3.4Junio C Hamano1-0/+5
2013-07-21Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maintJunio C Hamano1-1/+1
2013-07-21Merge branch 'dk/maint-t5150-dirname' into maintJunio C Hamano1-1/+1
2013-07-21Merge branch 'dk/version-gen-gitdir' into maintJunio C Hamano1-1/+1
2013-07-21Merge branch 'nk/config-local-doc' into maintJunio C Hamano1-0/+9
2013-07-21Merge branch 'kb/diff-blob-blob-doc' into maintJunio C Hamano1-7/+7
2013-07-21Merge branch 'mm/merge-in-dirty-worktree-doc' into maintJunio C Hamano1-2/+2
2013-07-21Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maintJunio C Hamano9-21/+20
2013-07-21Merge branch 'ft/doc-git-transport' into maintJunio C Hamano1-0/+3
2013-07-21Merge branch 'mh/maint-lockfile-overflow' into maintJunio C Hamano1-4/+6
2013-07-21Merge branch 'jc/maint-diff-core-safecrlf' into maintJunio C Hamano2-1/+17
2013-07-21t9801: git-p4: check ignore files with client specVitor Antunes1-3/+20
2013-07-19Start preparing for 1.8.3.4Junio C Hamano2-1/+16
2013-07-19apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller1-1/+1
2013-07-19http-push.c::add_send_request(): do not initialize transfer_requestStefan Beller1-1/+1
2013-07-19Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maintJunio C Hamano2-1/+2
2013-07-19Merge branch 'rr/name-rev-stdin-doc' into maintJunio C Hamano1-2/+4
2013-07-19Merge branch 'ft/diff-rename-default-score-is-half' into maintJunio C Hamano1-1/+1
2013-07-19Merge branch 'jc/t1512-fix' into maintJunio C Hamano2-11/+23
2013-07-19Merge branch 'vl/typofix' into maintJunio C Hamano3-3/+3
2013-07-19Merge branch 'wk/doc-git-has-grown' into maintJunio C Hamano1-3/+3
2013-07-19Merge branch 'ys/cygstart' into maintJunio C Hamano2-3/+9
2013-07-19Merge branch 'mm/push-force-is-dangerous' into maintJunio C Hamano1-0/+9
2013-07-19Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano3-6/+6
2013-07-19Merge branch 'js/test-ln-s-add' into maintJunio C Hamano30-333/+351
2013-07-19Merge branch 'jk/apache-test-for-2.4' into maintJunio C Hamano1-1/+19
2013-07-19Merge branch 'tr/test-commit-only-on-orphan' into maintJunio C Hamano1-0/+13
2013-07-19Merge branch 'sb/archive-zip-double-assignment-fix' into maintJunio C Hamano1-1/+0
2013-07-19Merge branch 'th/bisect-skip-report-range-fix' into maintJunio C Hamano1-2/+2
2013-07-19Merge branch 'rs/tar-tests' into maintJunio C Hamano3-78/+92
2013-07-19Merge branch 'rr/column-doc' into maintJunio C Hamano1-3/+17
2013-07-19Merge branch 'rs/discard-index-discard-array' into maintJunio C Hamano5-2/+32
2013-07-19Merge branch 'tr/coverage' into maintJunio C Hamano1-8/+13
2013-07-19Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-shStefan Beller1-1/+1
2013-07-15Git 1.8.3.3v1.8.3.3Junio C Hamano3-2/+24
2013-07-15Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2-1/+15
2013-07-15Merge branch 'bc/http-keep-memory-given-to-curl' into maintJunio C Hamano1-3/+9
2013-07-15Merge branch 'jk/pull-into-dirty-unborn' into maintJunio C Hamano2-2/+38
2013-07-15Merge branch 'fg/submodule-non-ascii-path' into maintJunio C Hamano2-1/+17
2013-07-15Merge branch 'fc/sequencer-plug-leak' into maintJunio C Hamano1-7/+11
2013-07-15Merge branch 'mt/send-email-cc-match-fix' into maintJunio C Hamano2-9/+106
2013-07-08test-lint: detect 'export FOO=bar'Thomas Rast1-0/+1
2013-07-08t9902: fix 'test A == B' to use = operatorThomas Rast1-1/+1
2013-07-07name-rev doc: rewrite --stdin paragraphRamkumar Ramachandra1-2/+4
2013-07-07lockfile: fix buffer overflow in path handlingMichael Haggerty1-4/+6
2013-07-05diff-options: document default similarity indexFraser Tweedale1-1/+1
2013-07-03fixup-builtins: retire an old transition helper scriptRamkumar Ramachandra2-19/+0
2013-07-03Update draft release notes to 1.8.3.3Junio C Hamano1-0/+15
2013-07-03Merge branch 'rr/diffcore-pickaxe-doc' into maintJunio C Hamano3-28/+59
2013-07-03Merge branch 'cr/git-work-tree-sans-git-dir' into maintJunio C Hamano1-3/+1
2013-07-03Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maintJunio C Hamano1-3/+3
2013-07-03Merge branch 'dm/unbash-subtree' into maintJunio C Hamano1-1/+1
2013-07-03Merge branch 'jc/core-checkstat' into maintJunio C Hamano1-1/+14
2013-07-03Merge branch 'jc/t5551-posix-sed-bre' into maintJunio C Hamano1-2/+6
2013-07-03Merge branch 'vv/help-unknown-ref' into maintJunio C Hamano3-1/+57
2013-07-03Merge branch 'rs/empty-archive' into maintJunio C Hamano2-0/+15
2013-07-03Merge branch 'rh/merge-options-doc-fix' into maintJunio C Hamano1-1/+2
2013-07-03Merge branch 'an/diff-index-doc' into maintJunio C Hamano1-6/+6
2013-07-03Merge branch 'cm/gitweb-project-list-persistent-cgi-fix' into maintJunio C Hamano1-1/+1
2013-07-03Merge branch 'ar/wildmatch-foldcase' into maintJunio C Hamano2-6/+56
2013-07-03Merge branch 'cb/log-follow-with-combined' into maintJunio C Hamano2-0/+17
2013-07-03Merge branch 'rr/die-on-missing-upstream' into maintJunio C Hamano2-17/+22
2013-07-03Merge branch 'maint-1.8.2' into maintJunio C Hamano1-1/+1
2013-07-03Merge branch 'maint-1.8.1' into maint-1.8.2Junio C Hamano1-1/+1
2013-07-03git-config: update doc for --get with multiple valuesJohn Keeping1-1/+1
2013-07-01get_short_sha1(): correctly disambiguate type-limited abbreviationJunio C Hamano1-1/+1
2013-07-01t1512: correct leftover constants from earlier editionJunio C Hamano1-10/+22
2013-07-01t7500: fix flipped actual/expectAndrew Pimlott1-3/+3
2013-07-01lib-rebase: document exec_ in FAKE_LINESAndrew Pimlott1-0/+2
2013-06-30Start preparing for 1.8.3.3Junio C Hamano2-1/+12
2013-06-30Merge branch 'fc/macos-x-clipped-write' into maintJunio C Hamano4-0/+27
2013-06-30Merge branch 'da/darwin' into maintJunio C Hamano2-0/+25
2013-06-30check-ignore doc: fix broken link to ls-files pageRamkumar Ramachandra1-1/+1
2013-06-30test: spell 'ls-files --delete' option correctly in test descriptionsSZEDER Gábor1-2/+2
2013-06-28Git 1.8.3.2v1.8.3.2Junio C Hamano3-2/+8
2013-06-28configure: fix option help message for --disable-pthreadsStefano Lattarini1-1/+1
2013-06-28Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano6-38/+97
2013-06-27Start preparing for 1.8.3.2Junio C Hamano2-1/+55
2013-06-27Merge branch 'ks/difftool-dir-diff-copy-fix' into maintJunio C Hamano2-7/+21
2013-06-27Merge branch 'rr/push-head' into maintJunio C Hamano1-7/+14
2013-06-27Merge branch 'fc/show-branch-in-rebase-am' into maintJunio C Hamano2-1/+3
2013-06-27Merge branch 'tg/maint-zsh-svn-remote-prompt' into maintJunio C Hamano1-3/+4
2013-06-27Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maintJunio C Hamano1-1/+1
2013-06-27Merge branch 'tr/push-no-verify-doc' into maintJunio C Hamano1-1/+6
2013-06-27Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2-4/+23
2013-06-27Merge branch 'jc/strbuf-branchname-fix' into maintJunio C Hamano2-4/+19
2013-06-27Merge branch 'mk/combine-diff-context-horizon-fix' into maintJunio C Hamano2-2/+53
2013-06-27Merge branch 'kb/ancestry-path-threedots' into maintJunio C Hamano3-1/+38
2013-06-27Merge branch 'jk/subtree-do-not-push-if-split-fails' into maintJunio C Hamano1-1/+2
2013-06-27Merge branch 'mh/fetch-into-shallow' into maintJunio C Hamano3-3/+16
2013-06-27Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano8-35/+221
2013-06-26documentation: add git:// transport security noticeFraser Tweedale1-0/+3
2013-06-26column doc: rewrite documentation for column.uiRamkumar Ramachandra1-3/+17
2013-06-25diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano2-1/+17
2013-06-23user-manual: Update download size for Git and the kernelW. Trevor King1-3/+3
2013-06-21lib-httpd/apache.conf: check version only after mod_version loadsJeff King1-3/+4
2013-06-21web--browse: support /usr/bin/cygstart on CygwinYaakov Selkowitz2-3/+9
2013-06-21completion: complete diff --word-diffRamkumar Ramachandra1-1/+1
2013-06-21apply: carefully strdup a possibly-NULL nameThomas Rast2-1/+15
2013-06-20pull: merge into unborn by fast-forwarding from empty treeThomas Rast2-1/+37
2013-06-20pull: update unborn branch tip after indexJeff King1-2/+2
2013-06-20t7400: test of UTF-8 submodule names pass under Mac OSTorsten Bögershausen1-8/+11
2013-06-20send-email: sanitize author when writing From lineMichael S. Tsirkin2-3/+4
2013-06-20send-email: add test for duplicate utf8 nameMichael S. Tsirkin1-0/+14
2013-06-19random typofixes (committed missing a 't', successful missing an 's')Veres Lajos3-3/+3
2013-06-19http.c: don't rewrite the user:passwd string multiple timesBrandon Casey1-3/+9
2013-06-18fix "builtin-*" references to be "builtin/*"Phil Hord9-21/+20
2013-06-18Documentation: Move "git diff <blob> <blob>"Kevin Bracey1-7/+7
2013-06-18Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy1-2/+2
2013-06-18Documentation/git-push.txt: explain better cases where --force is dangerousMatthieu Moy1-0/+9
2013-06-17config: Add description of --local optionNamhyung Kim1-0/+9
2013-06-17GIT-VERSION-GEN: support non-standard $GIT_DIR pathDennis Kaarsemaker1-1/+1
2013-06-17tests: allow sha1's as part of the pathDennis Kaarsemaker1-1/+1
2013-06-14t/lib-httpd/apache.conf: configure an MPM module for apache 2.4Jeff King1-0/+3
2013-06-14t/lib-httpd/apache.conf: load compat access module in apache 2.4Jeff King1-0/+3
2013-06-14t/lib-httpd/apache.conf: load extra auth modules in apache 2.4Jeff King1-0/+9
2013-06-14t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4Jeff King1-0/+2
2013-06-14handle multibyte characters in nameFredrik Gustafsson2-1/+14
2013-06-13use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe3-6/+6
2013-06-11Merge branch 'maint-1.8.2' into maintJunio C Hamano2-1/+1
2013-06-11t0070 "mktemp to unwritable directory" needs SANITYTorsten Bögershausen1-1/+1
2013-06-11pre-push.sample: Make the script executableWieland Hoffmann1-0/+0
2013-06-10Git 1.8.3.1v1.8.3.1Junio C Hamano4-2/+22
2013-06-10mingw: make mingw_signal return the correct handlerErik Faye-Lund1-1/+3
2013-06-09Merge branch 'jn/config-ignore-inaccessible' into maintJunio C Hamano5-15/+22
2013-06-09Merge branch 'kb/status-ignored-optim-2' into maintJunio C Hamano2-0/+21
2013-06-09read-cache: free cache in discard_indexRené Scharfe1-2/+3
2013-06-09read-cache: add simple performance testRené Scharfe4-0/+29
2013-06-09submodule: remove redundant check for the_index.initializedRené Scharfe1-3/+2
2013-06-09Document .git/modulesFredrik Gustafsson1-0/+3
2013-06-07t4011: remove SYMLINKS prerequisiteJohannes Sixt1-10/+25
2013-06-07t6035: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt1-26/+47
2013-06-07t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt3-36/+33
2013-06-07t3100: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt1-27/+15
2013-06-07t3030: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt1-36/+26
2013-06-07t0000: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt1-29/+10
2013-06-07tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)Johannes Sixt19-110/+106
2013-06-07tests: introduce test_ln_s_addJohannes Sixt2-0/+31
2013-06-07t3010: modernize styleJohannes Sixt1-62/+61
2013-06-07gitweb: fix problem causing erroneous project listCharles McGarvey1-1/+1
2013-06-07fetch-options.txt: prevent a wildcard refspec from getting misformattedJunio C Hamano1-1/+1
2013-06-06sequencer: avoid leaking message buffer when refusing to create an empty commitFelipe Contreras1-2/+4
2013-06-05test-send-email: test for pre-sanitized self nameMichael S. Tsirkin1-0/+5
2013-06-05t/send-email: test suppress-cc=self with non-asciiMichael S. Tsirkin1-0/+5
2013-06-05t/send-email: add test with quoted senderMichael S. Tsirkin1-0/+20
2013-06-05send-email: make --suppress-cc=self sanitize inputMichael S. Tsirkin1-8/+15
2013-06-05t/send-email: test suppress-cc=self on cccmdMichael S. Tsirkin1-1/+3
2013-06-05send-email: fix suppress-cc=self on cccmdMichael S. Tsirkin1-1/+1
2013-06-04t/README: test_must_fail is for testing GitJunio C Hamano1-0/+3
2013-06-03sequencer: remove useless indentationFelipe Contreras1-7/+9
2013-06-03diffcore-pickaxe doc: document -S and -G properlyRamkumar Ramachandra2-26/+57
2013-06-03diffcore-pickaxe: make error messages more consistentRamkumar Ramachandra1-2/+2
2013-06-03git.txt: remove stale comment regarding GIT_WORK_TREEChris Rorvick1-3/+1
2013-06-03sha1_file: trivial style cleanupFelipe Contreras1-1/+1
2013-06-03read-cache: trivial style cleanupsFelipe Contreras1-2/+2
2013-06-03read-cache: fix wrong 'the_index' usageFelipe Contreras1-1/+1
2013-06-03t/send-email.sh: add test for suppress-cc=selfMichael S. Tsirkin1-0/+43
2013-06-02test-chmtime: Fix exit code on WindowsJohannes Sixt1-4/+4
2013-06-02dir.c: fix ignore processing within not-ignored directoriesKarsten Blees2-0/+21
2013-06-02wildmatch: properly fold case everywhereAnthony Ramine2-6/+56
2013-06-02Test 'commit --only' after 'checkout --orphan'Thomas Rast1-0/+13
2013-06-02sha1_name: fix error message for @{<N>}, @{<date>}Ramkumar Ramachandra1-1/+10
2013-05-29push: make push.default = current use resolved HEADRamkumar Ramachandra1-1/+1
2013-05-29push: fail early with detached HEAD and currentRamkumar Ramachandra1-0/+5
2013-05-29Start 1.8.3.1 maintenance trackJunio C Hamano1-1/+1
2013-05-29Merge branch 'maint-1.8.2' into maintJunio C Hamano1-1/+1
2013-05-29archive-zip:write_zip_entry: Remove second reset of size variable to zero.Stefan Beller1-1/+0
2013-05-29difftool --dir-diff: allow changing any clean working tree fileKenichi Saita2-7/+21
2013-05-29push: factor out the detached HEAD error messageRamkumar Ramachandra1-6/+8
2013-05-29prompt: fix for simple rebaseFelipe Contreras2-1/+3
2013-05-28trivial: Add missing period in documentationPhil Hord1-1/+1
2013-05-28commit: don't start editor if empty message is given with -mRené Scharfe2-4/+23
2013-05-28fix segfault with git log -c --followClemens Buchacher2-0/+17
2013-05-28fetch-pack: prepare updated shallow file before fetching the packNguyễn Thái Ngọc Duy5-38/+93
2013-05-24Git 1.8.3v1.8.3Junio C Hamano1-11/+11
2013-05-24urls.txt: avoid auto converting to hyperlinkNguyễn Thái Ngọc Duy1-1/+1
2013-05-23Document push --no-verifyThomas Rast1-1/+6
2013-05-22bisect: Fix log output for multi-parent skip rangesTorstein Hegge1-2/+2
2013-05-22sha1_name: fix error message for @{u}Ramkumar Ramachandra2-16/+12
2013-05-22prompt: fix show upstream with svn and zshThomas Gummerer1-3/+4
2013-05-21imap-send: eliminate HMAC deprecation warnings on Mac OS XDavid Aguilar1-0/+10
2013-05-21remote-hg: fix order of configuration commentsFelipe Contreras1-3/+3
2013-05-21remote-hg: trivial configuration note cleanupFelipe Contreras1-1/+1
2013-05-21completion: regression fix for zshFelipe Contreras1-1/+1
2013-05-21contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bashDmitry Marakasov1-1/+1
2013-05-20Merge git://git.bogomips.org/git-svnJunio C Hamano3-6/+97
2013-05-20Documentation/diff-index: mention two modes of operationJunio C Hamano1-6/+6
2013-05-20t5000: test long filenamesRené Scharfe2-0/+46
2013-05-20t5000: simplify tar-tree testsRené Scharfe1-23/+8
2013-05-20t5000: use check_tar for prefix testRené Scharfe1-12/+12
2013-05-20t5000: factor out check_tarRené Scharfe1-13/+22
2013-05-20t5000, t5003: create directories for extracted files lazilyRené Scharfe2-4/+4
2013-05-20t5000: integrate export-subst tests into regular testsRené Scharfe1-32/+6
2013-05-20git-svn: introduce --parents parameter for commands branch and tagTobias Schulte3-1/+71
2013-05-20git-svn: clarify explanation of --destination argumentJonathan Nieder1-5/+14
2013-05-20git-svn: multiple fetch/branches/tags keys are supportedNathan Gray1-0/+12
2013-05-20remote-hg: set stdout to binary mode on win32Amit Bakshi1-0/+4
2013-05-20cache.h: eliminate SHA-1 deprecation warnings on Mac OS XDavid Aguilar1-0/+6