summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-09-11Git 1.7.11.6v1.7.11.6Junio C Hamano3-35/+58
2012-09-11Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11Junio C Hamano1-273/+308
2012-09-11Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano3-2/+21
2012-09-11Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2-0/+39
2012-09-11Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11Junio C Hamano1-0/+2
2012-09-11Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano3-6/+11
2012-09-11Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11Junio C Hamano1-2/+2
2012-09-11Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Junio C Hamano2-7/+52
2012-09-11Merge branch 'mz/empty-rebase-test' into maint-1.7.11Junio C Hamano1-1/+17
2012-09-11Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11Junio C Hamano2-3/+3
2012-09-11Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2-0/+31
2012-09-11Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Junio C Hamano1-8/+8
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano13-32/+16
2012-09-11Merge branch 'tr/merge-recursive-flush' into maint-1.7.11Junio C Hamano1-18/+1
2012-09-11Merge branch 'nd/index-errno' into maint-1.7.11Junio C Hamano1-5/+1
2012-09-11Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano1-1/+0
2012-09-10Almost 1.7.11.6Junio C Hamano1-1/+29
2012-09-10Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano1-2/+1
2012-09-10Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11Junio C Hamano1-0/+4
2012-09-10Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2-1/+37
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano18-32/+188
2012-09-10Merge branch 'tr/maint-send-email-2047' into maint-1.7.11Junio C Hamano2-4/+19
2012-09-10Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11Junio C Hamano1-3/+5
2012-09-10Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11Junio C Hamano1-0/+5
2012-08-24Prepare for 1.7.11.6Junio C Hamano2-1/+35
2012-08-24Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11Junio C Hamano1-0/+1
2012-08-24Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11Junio C Hamano1-0/+8
2012-08-24Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11Junio C Hamano1-7/+24
2012-08-24Merge branch 'hv/coding-guidelines' into maint-1.7.11Junio C Hamano1-0/+8
2012-08-24Merge branch 'jc/tag-doc' into maint-1.7.11Junio C Hamano7-16/+27
2012-08-24Merge branch 'mk/test-seq' into maint-1.7.11Junio C Hamano3-2/+23
2012-08-24Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11Junio C Hamano1-3/+0
2012-08-24Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11Junio C Hamano2-0/+2
2012-08-24Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11Junio C Hamano1-1/+1
2012-08-24Make 'git submodule update --force' always check out submodules.Stefan Zager3-2/+21
2012-08-23mergetool: style fixesJunio C Hamano1-273/+308
2012-08-23Make the ciabot scripts completely self-configuring in the normal case.Eric S. Raymond4-37/+72
2012-08-23Improved documentation for the ciabot scripts.Eric S. Raymond2-2/+50
2012-08-22contrib/ciabot: Get ciabot configuration from git variablesEric S. Raymond2-118/+156
2012-08-18git-config doc: unconfuse an exampleJunio C Hamano1-1/+1
2012-08-18git-config.txt: fix exampleMichael Haggerty1-1/+1
2012-08-17stash: invoke rerere in case of conflictPhil Hord2-1/+2
2012-08-17test: git-stash conflict sets up rererePhil Hord1-0/+38
2012-08-17man: git pull -r is a short for --rebaseMiklos Vajna1-0/+1
2012-08-16gitcli: describe abbreviation of long optionsJunio C Hamano1-0/+8
2012-08-15Git 1.7.11.5v1.7.11.5Junio C Hamano3-2/+11
2012-08-15Merge branch 'rj/maint-grep-remove-redundant-test' into maintJunio C Hamano1-11/+0
2012-08-15Merge branch 'hv/link-alt-odb-entry' into maintJunio C Hamano1-1/+1
2012-08-15rev-list docs: clarify --topo-order descriptionJunio C Hamano1-7/+24
2012-08-15gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFOJay Soffian1-0/+5
2012-08-15Documentation/CodingGuidelines: spell out more shell guidelinesHeiko Voigt1-0/+8
2012-08-14Let submodule command exit with error status if path does not existHeiko Voigt2-7/+52
2012-08-10rebase -i: use full onto sha1 in reflogMichael J Gruber1-2/+1
2012-08-09add tests for 'git rebase --keep-empty'Martin von Zweigbergk1-1/+17
2012-08-08sh-setup: protect from exported IFSJunio C Hamano1-0/+4
2012-08-07docs: monospace listings in docbook outputJeff King2-3/+3
2012-08-06receive-pack: do not leak output from auto-gc to standard outputJunio C Hamano2-2/+3
2012-08-06t/t5400: demonstrate breakage caused by informational message from pruneBrandon Casey1-0/+35
2012-08-06Enable HAVE_DEV_TTY for SolarisBen Walton1-0/+1
2012-08-06terminal: seek when switching between reading and writingJeff King1-0/+1
2012-08-06Prepare for 1.7.11.5Junio C Hamano2-1/+29
2012-08-06Merge branch 'jn/block-sha1' into maintJunio C Hamano2-7/+6
2012-08-06Merge branch 'jn/make-assembly-in-right-directory' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'ms/daemon-doc-typo' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'lm/git-blame-el' into maintJunio C Hamano1-36/+37
2012-08-06Merge branch 'rs/ipv6-ssh-url' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'rs/git-blame-mapcar-mapc' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'rr/doc-commit' into maintJunio C Hamano1-0/+8
2012-08-06doc: A few minor copy edits.Štěpán Němec5-10/+10
2012-08-06Merge branch 'jk/maint-checkout-orphan-check-fix' into maintJunio C Hamano1-1/+1
2012-08-06Merge branch 'mh/maint-revisions-doc' into maintJunio C Hamano1-6/+37
2012-08-06Merge branch 'jc/mergetool-tool-help' into maintJunio C Hamano3-5/+49
2012-08-06Documentation: do not mention .git/refs/* directoriesJunio C Hamano7-16/+27
2012-08-06read_index_from: remove bogus errno assignmentsNguyễn Thái Ngọc Duy1-5/+1
2012-08-05apply: delete unused deflate_origlen from patch structPaul Gortmaker1-1/+0
2012-08-05Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2-0/+31
2012-08-04tests: Introduce test_seqMichał Kiedrowicz3-2/+23
2012-08-03merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast1-18/+1
2012-08-03diff_setup_done(): return voidThomas Rast13-32/+16
2012-08-03setup: clarify error messages for file/revisions ambiguityMatthieu Moy1-3/+5
2012-07-31send-email: improve RFC2047 quote parsingThomas Rast2-4/+19
2012-07-31sane_execvp(): ignore non-directory on $PATHJunio C Hamano1-0/+2
2012-07-30Git 1.7.11.4v1.7.11.4Junio C Hamano4-3/+35
2012-07-30Merge branch 'jk/maint-commit-document-editmsg' into maintJunio C Hamano1-0/+9
2012-07-30Merge branch 'jk/maint-advise-vaddf' into maintJunio C Hamano1-1/+1
2012-07-30Merge branch 'kk/maint-commit-tree' into maintJunio C Hamano3-4/+18
2012-07-30Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2-3/+64
2012-07-30Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maintJunio C Hamano2-0/+8
2012-07-30Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maintJunio C Hamano2-2/+17
2012-07-30Merge branch 'jc/maint-filter-branch-epoch-date' into maintJunio C Hamano4-5/+15
2012-07-30t7406: fix misleading "rev-parse --max-count=1 HEAD"Junio C Hamano1-8/+8
2012-07-30config: "git config baa" should exit with status 1Junio C Hamano3-6/+11
2012-07-29t7810-*.sh: Remove redundant testRamsay Jones1-11/+0
2012-07-29link_alt_odb_entry: fix read over array bounds reported by valgrindHeiko Voigt1-1/+1
2012-07-29fsck: detect null sha1 in tree entriesJeff King2-1/+33
2012-07-29do not write null sha1s to on-disk indexJeff King2-0/+21
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King14-32/+135
2012-07-25checkout: don't confuse ref and object flagsJeff King1-1/+1
2012-07-24Enumerate revision range specifiers in the documentationJunio C Hamano1-0/+31
2012-07-23commit: document the temporary commit message fileJeff King1-0/+9
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano3-5/+49
2012-07-23commit: check committer identity more strictlyJeff King1-1/+1
2012-07-23advice: pass varargs to strbuf_vaddf, not strbuf_addfJeff King1-1/+1
2012-07-23Makefile: BLK_SHA1 does not require fast htonl() and unaligned loadsJonathan Nieder1-3/+2
2012-07-22Makefile: fix location of listing produced by "make subdir/foo.s"Jonathan Nieder1-1/+1
2012-07-22block-sha1: put expanded macro parameters in parenthesesJonathan Nieder1-2/+2
2012-07-22block-sha1: avoid pointer conversion that violates alignment constraintsJonathan Nieder1-3/+3
2012-07-22Git 1.7.11.3v1.7.11.3Junio C Hamano4-3/+57
2012-07-22Merge branch 'jk/push-delete-ref-error-message' into maintJunio C Hamano1-0/+3
2012-07-22Merge branch 'ar/clone-honor-umask-at-top' into maintJunio C Hamano3-3/+3
2012-07-22Merge branch 'cw/amend-commit-without-message' into maintJunio C Hamano2-1/+16
2012-07-22Merge branch 'jk/maint-commit-amend-only-no-paths' into maintJunio C Hamano2-1/+14
2012-07-22Merge branch 'tg/maint-cache-name-compare' into maintJunio C Hamano2-4/+48
2012-07-22Merge branch 'tr/maint-show-walk' into maintJunio C Hamano2-0/+94
2012-07-22Merge branch 'jc/refactor-diff-stdin' into maintJunio C Hamano4-50/+67
2012-07-22Merge branch 'mz/empty-rebase-test' into maintJunio C Hamano1-0/+8
2012-07-22Merge branch 'js/fast-export-paths-with-spaces' into maintJunio C Hamano2-1/+3
2012-07-22Merge branch 'cw/no-detaching-an-unborn' into maintJunio C Hamano2-0/+8
2012-07-22Merge branch 'vr/use-our-perl-in-tests' into maintJunio C Hamano26-44/+65
2012-07-19diff: test precedence of external diff driversJeff King1-0/+40
2012-07-17diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2-3/+24
2012-07-17Revert "git-commit-tree(1): update synopsis"Junio C Hamano1-1/+1
2012-07-17Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeJunio C Hamano2-3/+17
2012-07-17commit-tree: resurrect command line parsing updatesJunio C Hamano2-3/+17
2012-07-16Documentation/git-daemon: add missing wordMichael Schubert1-1/+1
2012-07-13am: indicate where a failed patch is to be foundPaul Gortmaker2-0/+8
2012-07-12t7003: add test to filter a branch with a commit at epochJunio C Hamano2-3/+13
2012-07-12date.c: Fix off by one error in object-header date parsingJunio C Hamano1-1/+1
2012-07-12submodules: don't stumble over symbolic links when cloning recursivelyJens Lehmann2-2/+17
2012-07-11Git 1.7.11.2v1.7.11.2Junio C Hamano4-3/+57
2012-07-11Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano1-4/+21
2012-07-11Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maintJunio C Hamano2-2/+10
2012-07-11Merge branch 'th/diff-no-index-fixes' into maintJunio C Hamano5-24/+112
2012-07-11Merge branch 'nd/clone-single-fix' into maintJunio C Hamano2-3/+11
2012-07-11Merge branch 'jc/rev-list-simplify-merges-first-parent' into maintJunio C Hamano1-12/+29
2012-07-11Merge branch 'hv/submodule-update-nuke-submodules' into maintJunio C Hamano1-6/+0
2012-07-11Merge branch 'jk/diff-no-index-pager' into maintJunio C Hamano3-15/+22
2012-07-11Merge branch 'mm/verify-filename-fix' into maintJunio C Hamano8-10/+44
2012-07-11Merge branch 'cn/cherry-pick-range-docs' into maintJunio C Hamano2-1/+13
2012-07-11Merge branch 'jc/ustar-checksum-is-unsigned' into maintJunio C Hamano1-3/+3
2012-07-11Merge branch 'jc/bundle-complete-notice' into maintJunio C Hamano1-6/+10
2012-07-11Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano6-10/+109
2012-07-11Merge branch 'jc/request-pull-match-tagname' into maintJunio C Hamano1-7/+22
2012-07-11cache_name_compare(): do not truncate while comparing pathsJunio C Hamano2-4/+48
2012-07-10commit: fix "--amend --only" with no pathspecJeff King2-1/+14
2012-07-09add: create ADD_EDIT.patch with mode 0666Jeff King1-1/+1
2012-07-09filter-branch: do not forget the '@' prefix to force git-timestampJunio C Hamano1-1/+1
2012-07-09rerere: make rr-cache fanout directory honor umaskJunio C Hamano1-1/+1
2012-07-09Restore umasks influence on the permissions of work tree created by cloneAlex Riesen1-1/+1
2012-07-09Allow edit of empty message with commit --amendChris Webb2-1/+16
2012-07-05Make <refname> documentation more consistent.Max Horn1-6/+6
2012-07-03push: don't guess at qualifying remote refs on deletionJeff King1-0/+3
2012-07-02Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano1-562/+2270
2012-07-02blame: compute abbreviation width that ensures uniquenessJunio C Hamano1-4/+21
2012-07-01Update Swedish translation (1066t0f0u)Peter Krefting1-562/+2270
2012-06-28diff-index.c: "git diff" has no need to read blob from the standard inputJunio C Hamano4-31/+55
2012-06-28diff-index.c: unify handling of command line pathsJunio C Hamano1-16/+11
2012-06-28diff-index.c: do not pretend paths are pathspecsJunio C Hamano1-7/+5
2012-06-27fast-export: quote paths with spacesJay Soffian2-1/+3
2012-06-27add test case for rebase of empty commitMartin von Zweigbergk1-0/+8
2012-06-26index-pack: Disable threading on cygwinJunio C Hamano2-2/+10
2012-06-26git-checkout: disallow --detach on unborn branchChris Webb2-0/+8
2012-06-25git-submodule.sh: fix filename in comment.Michał Górny1-1/+1
2012-06-25git-add--interactive.perl: Remove two unused variablesThomas Badie1-2/+0
2012-06-24t/README: add a bit more Don'tsJunio C Hamano1-3/+22
2012-06-24tests: enclose $PERL_PATH in double quotesJunio C Hamano24-41/+41
2012-06-24t/test-lib.sh: export PERL_PATH for use in scriptsJunio C Hamano1-0/+2
2012-06-22Documentation: Fix misspellingsLeila Muhtasib5-6/+6
2012-06-22clone: fix ref selection in --single-branch --branch=xxxNguyễn Thái Ngọc Duy2-3/+11
2012-06-22diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds ch...Tim Henigan2-2/+73
2012-06-22diff: handle relative paths in no-indexJeff King4-22/+39
2012-06-21Git 1.7.11.1v1.7.11.1Junio C Hamano4-3/+13
2012-06-20docs: always define git-relative-html-prefix attributeJeff King1-0/+2
2012-06-19show: fix "range implies walking"Junio C Hamano2-2/+5
2012-06-19Demonstrate git-show is broken with rangesThomas Rast1-0/+91
2012-06-19git-commit-tree(1): update synopsisJunio C Hamano1-1/+1
2012-06-19Documentation: spelling fixesMiklos Vajna6-6/+6
2012-06-18verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy7-10/+33
2012-06-18sha1_name: do not trigger detailed diagnosis for file argumentsMatthieu Moy2-1/+12
2012-06-17Git 1.7.11v1.7.11Junio C Hamano3-10/+6
2012-06-17Sync with 1.7.10.5Junio C Hamano2-1/+14
2012-06-17Git 1.7.10.5v1.7.10.5Junio C Hamano4-3/+16
2012-06-17Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn1-0/+1
2012-06-17Merge branch 'js/maint-fast-export-mark-error' into maintJunio C Hamano1-1/+1
2012-06-15Merge git://github.com/git-l10n/git-poJunio C Hamano2-703/+927
2012-06-15Merge branch 'as/diff-shortstat-ignore-binary'Junio C Hamano2-1/+13
2012-06-15diff: Only count lines in show_shortstatsAlexander Strasser2-1/+13
2012-06-15do not run pager with diff --no-index --quietJeff King1-3/+3
2012-06-15fix pager.diff with diff --no-indexJeff King3-13/+20
2012-06-15perl/Makefile: install Git::SVN::* when NO_PERL_MAKEMAKER=yes, tooJonathan Nieder1-7/+24
2012-06-15perl/Makefile.PL: warn about duplicate module list in perl/MakefileJonathan Nieder1-0/+4
2012-06-15builtin.h: remove unused cmd_<foo> declarationsLuka Perkov1-3/+0
2012-06-15git-cherry-pick.txt: clarify the use of revision range notationCarlos Martín Nieto1-1/+12
2012-06-15Documentation: --no-walk is no-op if range is specifiedCarlos Martín Nieto1-0/+1
2012-06-14git-blame.el: Do not use bare 0 to mean (point-min)Lawrence Mitchell1-1/+1
2012-06-14git-blame.el: Use with-current-buffer where appropriateLawrence Mitchell1-37/+37
2012-06-14git-blame.el: Do not use goto-line in lisp codeRüdiger Sonderfeld1-1/+2
2012-06-14l10n: it.po: translate 212 new messagesMarco Paolone2-703/+927
2012-06-13revision: ignore side parents while running simplify-mergesJunio C Hamano1-3/+11
2012-06-13git: Wrong parsing of ssh urls with IPv6 literals ignores portRené Scharfe1-1/+1