summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-02-14Git 1.7.9.1v1.7.9.1Junio C Hamano3-2/+14
2012-02-13Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2-32/+53
2012-02-13Merge branch 'bw/inet-pton-ntop-compat' into maintJunio C Hamano2-12/+0
2012-02-13Merge branch 'mp/make-cleanse-x-for-exe' into maintJunio C Hamano1-0/+3
2012-02-13Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2-3/+19
2012-02-13Update draft release notes to 1.7.9.1Junio C Hamano1-3/+19
2012-02-13Merge branch 'js/add-e-submodule-fix' into maintJunio C Hamano1-0/+1
2012-02-13Merge branch 'jc/parse-date-raw' into maintJunio C Hamano4-1/+60
2012-02-13Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2-1/+15
2012-02-13Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano3-4/+61
2012-02-13Merge branch 'jn/rpm-spec' into maintJunio C Hamano1-0/+1
2012-02-13t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason6-10/+10
2012-02-13Remove Git's support for smoke testingÆvar Arnfjörð Bjarmason3-133/+1
2012-02-13Makefile: Change the default compiler from "gcc" to "cc"Ævar Arnfjörð Bjarmason1-1/+1
2012-02-10Update draft release notes to 1.7.9.1Junio C Hamano1-0/+17
2012-02-10Merge branch 'jc/maint-request-pull-for-tag' into maintJunio C Hamano3-8/+4
2012-02-10Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2-2/+25
2012-02-10Merge branch 'jl/submodule-re-add' into maintJunio C Hamano2-0/+9
2012-02-10Merge branch 'da/maint-mergetool-twoway' into maintJunio C Hamano2-5/+35
2012-02-09Explicitly set X to avoid potential build breakageMichael Palimaka1-0/+3
2012-02-09merge: do not launch an editor on "--no-edit $tag"Junio C Hamano2-3/+19
2012-02-08tag: do not show non-tag contents with "-n"Junio C Hamano2-10/+25
2012-02-07add -e: do not show difference in a submodule that is merely dirtyJohannes Schindelin1-0/+1
2012-02-06tag: die when listing missing or corrupt objectsJeff King1-1/+5
2012-02-06tag: fix output of "tag -n" when errors occurJeff King1-32/+34
2012-02-06Prepare for 1.7.9.1Junio C Hamano2-1/+20
2012-02-06completion: --edit and --no-edit for git-mergeAdrian Weimann1-1/+1
2012-02-05Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano2-4/+33
2012-02-05Merge branch 'jc/maint-log-first-parent-pathspec' into maintJunio C Hamano2-1/+10
2012-02-05Merge branch 'cb/push-quiet' into maintJunio C Hamano8-19/+78
2012-02-05Merge branch 'cb/maint-kill-subprocess-upon-signal' into maintJunio C Hamano3-1/+72
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-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-02-05branch --edit-description: protect against mistyped branch nameJunio C Hamano2-4/+52
2012-02-05Drop system includes from inet_pton/inet_ntop compatibility wrappersBen Walton2-12/+0
2012-02-05merge: do not create a signed tag merge under --ff-only optionJunio C Hamano2-1/+15
2012-02-03parse_date(): '@' prefix forces git-timestampJunio C Hamano4-2/+32
2012-02-03parse_date(): allow ancient git-timestampJunio C Hamano1-0/+29
2012-02-03git.spec: Workaround localized messages not put in any RPMJakub Narebski1-0/+1
2012-02-03tests: add write_script helper functionJunio C Hamano1-0/+9
2012-01-31request-pull: explicitly ask tags/$name to be pulledJunio C Hamano3-8/+4
2012-01-27Git 1.7.9v1.7.9Junio C Hamano2-1/+6
2012-01-26INSTALL: warn about recent Fedora breakageJunio C Hamano1-1/+5
2012-01-26git-completion: workaround zsh COMPREPLY bugFelipe Contreras1-0/+8
2012-01-26docs: minor grammar fixes for v1.7.9 release notesJeff King1-6/+7
2012-01-24submodule add: fix breakage when re-adding a deep submoduleJens Lehmann2-0/+9
2012-01-23mergetool: Provide an empty file when neededDavid Aguilar2-5/+35
2012-01-23grep: fix -l/-L interaction with decoration linesAlbert Yale2-2/+25
2012-01-23Fix typo in 1.7.9 release notesMichael Haggerty1-1/+1
2012-01-20remote-curl: Fix push status report when all branches failShawn O. Pearce2-4/+33
2012-01-19Making pathspec limited log play nicer with --first-parentJunio C Hamano2-1/+10
2012-01-18Git 1.7.9-rc2v1.7.9-rc2Junio C Hamano2-10/+2
2012-01-18Merge branch 'maint'Junio C Hamano3-2/+12
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-18Merge branch 'jc/pull-signed-tag-doc'Junio C Hamano2-1/+221
2012-01-18pulling signed tag: add howto documentJunio C Hamano2-1/+221
2012-01-18Merge branch 'jk/credentials'Junio C Hamano2-22/+92
2012-01-18Merge branch 'nd/pathspec-recursion-cleanup'Junio C Hamano4-0/+16
2012-01-18Merge branch 'mh/maint-show-ref-doc'Junio C Hamano1-3/+3
2012-01-18Merge branch 'tr/maint-word-diff-incomplete-line'Junio C Hamano2-0/+23
2012-01-16credential-cache: ignore "connection refused" errorsJeff King1-1/+1
2012-01-16Merge branch 'jn/maint-gitweb-grep-fix'Junio C Hamano1-10/+10
2012-01-16diff-index: enable recursive pathspec matching in unpack_treesNguyen Thai Ngoc Duy2-0/+10
2012-01-14Document limited recursion pathspec matching with wildcardsNguyễn Thái Ngọc Duy2-0/+6
2012-01-13git-show-ref doc: typeset regexp in fixed width fontMichael Haggerty1-1/+1
2012-01-13git-show-ref: fix escaping in asciidoc sourceMichael Haggerty1-3/+3
2012-01-12Git 1.7.9-rc1v1.7.9-rc1Junio C Hamano2-2/+6
2012-01-12Merge branch 'jc/request-pull-show-head-4'Junio C Hamano1-1/+1
2012-01-12Merge branch 'tr/maint-mailinfo'Junio C Hamano1-7/+18
2012-01-12Merge branch 'ss/maint-msys-cvsexportcommit'Junio C Hamano2-3/+10
2012-01-12Merge branch 'jk/maint-upload-archive'Junio C Hamano1-6/+15
2012-01-12Merge branch 'maint'Junio C Hamano4-2/+22
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-12word-diff: ignore '\ No newline at eof' markerThomas Rast2-0/+23
2012-01-11archive: re-allow HEAD:Documentation on a remote invocationCarlos Martín Nieto1-6/+15
2012-01-11Merge branch 'maint'Junio C Hamano2-1/+2
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-11git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYSSebastian Schuberth1-0/+7
2012-01-11t9200: On MSYS, do not pass Windows-style paths to CVSSebastian Schuberth1-3/+3
2012-01-11unix-socket: do not let close() or chdir() clobber errno during cleanupJonathan Nieder1-17/+22
2012-01-11mailinfo documentation: accurately describe non -k caseThomas Rast1-7/+18
2012-01-11t2203: fix wrong commit commandNguyễn Thái Ngọc Duy1-1/+1
2012-01-10request-pull: use the real fork point when preparing the messageJunio C Hamano1-1/+1
2012-01-10Merge branch 'bw/maint-t8006-sed-incomplete-line'Junio C Hamano1-1/+1
2012-01-10Sync with maintJunio C Hamano6-33/+91
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-10credential-cache: report more daemon connection errorsJeff King1-3/+7
2012-01-10unix-socket: handle long socket pathnamesJeff King1-5/+66
2012-01-09Use perl instead of sed for t8006-blame-textconv testBen Walton1-1/+1
2012-01-09Merge branch 'jk/credentials'Junio C Hamano1-4/+3
2012-01-09Merge branch 'mh/ref-api-less-extra-refs'Junio C Hamano1-29/+22
2012-01-09Merge branch 'mm/maint-gitweb-project-maxdepth'Junio C Hamano1-2/+2
2012-01-09Merge branch 'maint'Junio C Hamano1-1/+1
2012-01-09send-email: multiedit is a boolean config optionJeff King1-1/+1
2012-01-08dashed externals: kill children on exitClemens Buchacher3-1/+3
2012-01-08run-command: optionally kill children on exitJeff King2-0/+69
2012-01-08credentials: unable to connect to cache daemonClemens Buchacher1-4/+3
2012-01-08t5541: avoid TAP test miscountingMichael J Gruber1-1/+1
2012-01-08fix push --quiet: add 'quiet' capability to receive-packClemens Buchacher5-6/+40
2012-01-08server_supports(): parse feature list more carefullyJunio C Hamano4-13/+38
2012-01-06Git 1.7.9-rc0v1.7.9-rc0Junio C Hamano2-1/+8
2012-01-06Merge branch 'jc/show-sig'Junio C Hamano16-34/+488
2012-01-06Merge branch 'jm/stash-diff-disambiguate'Junio C Hamano4-31/+80
2012-01-06Merge branch 'jh/fetch-head-update'Junio C Hamano25-102/+114
2012-01-06Merge branch 'pw/p4-view-updates'Junio C Hamano3-82/+564
2012-01-06Sync with 1.7.8.3Junio C Hamano3-5/+24
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-06write_head_info(): handle "extra refs" locallyMichael Haggerty1-4/+3
2012-01-06show_ref(): remove unused "flag" and "cb_data" argumentsMichael Haggerty1-5/+5
2012-01-06receive-pack: move more work into write_head_info()Michael Haggerty1-24/+18
2012-01-05gitweb: Harden "grep" search against filenames with ':'Jakub Narebski1-2/+3
2012-01-05gitweb: Fix file links in "grep" searchJakub Narebski1-8/+7
2012-01-05log --show-signature: reword the common two-head merge caseJunio C Hamano1-0/+12
2012-01-05log-tree: show mergetag in log --show-signature outputJunio C Hamano1-1/+75
2012-01-05log-tree.c: small refactor in show_signature()Junio C Hamano1-12/+16
2012-01-05commit --amend -S: strip existing gpgsig headersJunio C Hamano4-8/+36
2012-01-05verify_signed_buffer: fix stale commentJunio C Hamano1-4/+1
2012-01-05Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'Junio C Hamano15-19/+364
2012-01-04Merge branch 'maint'Junio C Hamano2-4/+7
2012-01-04t5550: repack everything into one fileClemens Buchacher1-2/+1
2012-01-04gitweb: accept trailing "/" in $project_listMatthieu Moy1-2/+2
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-03write first for-merge ref to FETCH_HEAD firstJoey Hess25-102/+114
2012-01-03git-p4: view spec documentationPete Wyckoff1-13/+27
2012-01-03git-p4: rewrite view handlingPete Wyckoff2-101/+258
2012-01-03git-p4: support single file p4 client view mapsGary Gibbons2-10/+21
2012-01-03git-p4: sort client views by reverse View numberGary Gibbons2-3/+10
2012-01-03git-p4: fix test for unsupported P4 Client ViewsGary Gibbons2-3/+6
2012-01-03git-p4: test client view handlingPete Wyckoff1-0/+290
2012-01-03Merge branch 'pw/p4-docs-and-tests'Junio C Hamano10-343/+830
2012-01-03Merge branch 'maint'Junio C Hamano5-8/+19
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
2012-01-01stash: Don't fail if work dir contains file named 'HEAD'Jonathon Mah4-31/+80
2011-12-29Add MYMETA.json to perl/.gitignoreJack Nagel1-0/+1
2011-12-28Update draft release notes to 1.7.9Junio C Hamano1-72/+4
2011-12-28Sync with 1.7.8.2Junio C Hamano2-1/+72
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-27git-p4: document and test submit optionsPete Wyckoff3-2/+67
2011-12-27git-p4: test and document --use-client-specPete Wyckoff3-2/+55
2011-12-27git-p4: test --keep-pathPete Wyckoff1-0/+24
2011-12-27git-p4: test --max-changesPete Wyckoff1-0/+10
2011-12-27git-p4: document and test --import-localPete Wyckoff2-1/+25
2011-12-27git-p4: honor --changesfile option and testPete Wyckoff2-1/+38
2011-12-27git-p4: document and test clone --branchPete Wyckoff2-1/+20