summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-10-17Git 1.7.12.4v1.7.12.4Junio C Hamano4-3/+27
2012-10-17Merge branch 'jk/maint-http-half-auth-push' into maintJunio C Hamano3-6/+6
2012-10-17Merge branch 'rr/git-uri-doc' into maintJunio C Hamano1-2/+6
2012-10-17Merge branch 'bw/cp-a-is-gnuism' into maintJunio C Hamano3-3/+3
2012-10-17Merge branch 'nd/doc-ignore' into maintJunio C Hamano1-1/+5
2012-10-17Merge branch 'jc/doc-long-options' into maintJunio C Hamano1-1/+11
2012-10-17Merge branch 'jc/maint-t1450-fsck-order-fix' into maintJunio C Hamano1-3/+1
2012-10-17Merge branch 'rr/test-use-shell-path-not-shell' into maintJunio C Hamano1-16/+16
2012-10-17Merge branch 'rr/test-make-sure-we-have-git' into maintJunio C Hamano2-10/+9
2012-10-17Merge branch 'po/maint-docs' into maintJunio C Hamano5-15/+28
2012-10-17Merge branch 'jc/ll-merge-binary-ours' into maintJunio C Hamano5-12/+41
2012-10-17Merge branch 'db/doc-custom-xmlto' into maintJunio C Hamano1-2/+3
2012-10-13Fix spelling error in post-receive-email hookRichard Fearn1-1/+1
2012-10-12http: fix segfault in handle_curl_resultJeff King3-6/+6
2012-10-12gitweb.cgi: fix "comitter_tz" typo in feedDylan Alex Simon1-1/+1
2012-10-10attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy1-0/+5
2012-10-09Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano1-7/+7
2012-10-08tests: "cp -a" is a GNUismBen Walton3-3/+3
2012-10-08Git url doc: mark ftp/ftps as read-only and deprecate themRamkumar Ramachandra1-2/+6
2012-10-08Git 1.7.12.3v1.7.12.3Junio C Hamano3-2/+19
2012-10-08Merge branch 'os/commit-submodule-ignore' into maintJunio C Hamano1-0/+1
2012-10-08Merge branch 'jk/receive-pack-unpack-error-to-pusher' into maintJunio C Hamano2-5/+32
2012-10-08Merge branch 'rt/maint-clone-single' into maintJunio C Hamano3-18/+218
2012-10-08Merge branch 'jc/blame-follows-renames' into maintJunio C Hamano1-0/+6
2012-10-08Merge branch 'lt/mailinfo-handle-attachment-more-sanely' into maintJunio C Hamano1-11/+0
2012-10-07gitignore.txt: suggestions how to get literal # or ! at the beginningNguyễn Thái Ngọc Duy1-1/+5
2012-10-04gitcli: parse-options lets you omit tail of long optionsJunio C Hamano1-1/+11
2012-10-04l10n: de.po: fix a few minor typosSimon Ruderich1-7/+7
2012-10-02t1450: the order the objects are checked is undefinedJunio C Hamano1-3/+1
2012-10-02Start preparing for 1.7.12.3Junio C Hamano2-1/+19
2012-10-02Merge branch 'rr/maint-submodule-unknown-cmd' into maintJunio C Hamano3-4/+11
2012-10-02Merge branch 'sp/maint-http-enable-gzip' into maintJunio C Hamano3-3/+5
2012-10-02Merge branch 'sp/maint-http-info-refs-no-retry' into maintJunio C Hamano1-16/+2
2012-10-02l10n: Fix to Swedish translationPeter Krefting1-2/+2
2012-09-30mailinfo: don't require "text" mime type for attachmentsLinus Torvalds1-11/+0
2012-09-29Git 1.7.12.2v1.7.12.2Junio C Hamano3-2/+11
2012-09-29Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2-28/+28
2012-09-29Merge branch 'jc/maint-log-grep-all-match-1' into maintJunio C Hamano6-25/+217
2012-09-29Merge branch 'jc/maint-mailinfo-mime-attr' into maintJunio C Hamano6-4/+32
2012-09-28Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN into maintJiang Xin1-23/+23
2012-09-28Merge branch 'maint' of https://github.com/ralfth/git-po-de into maintJiang Xin1-5/+5
2012-09-27l10n: de.po: correct translation of a 'rebase' messageRalf Thielow1-5/+5
2012-09-25submodule: if $command was not matched, don't parse other argsRamkumar Ramachandra3-4/+11
2012-09-25test-lib: use $SHELL_PATH, not $SHELLRamkumar Ramachandra1-16/+16
2012-09-25Revert "completion: fix shell expansion of items"Jeff King1-8/+1
2012-09-24Start preparation for 1.7.12.2Junio C Hamano2-1/+33
2012-09-24Merge branch 'jc/maint-blame-no-such-path' into maintJunio C Hamano2-17/+74
2012-09-24Merge branch 'dj/fetch-all-tags' into maintJunio C Hamano7-39/+92
2012-09-24Improve the description of GIT_PS1_SHOWUPSTREAMJonathan "Duke" Leto1-3/+4
2012-09-24commit: pay attention to submodule.$name.ignore in .gitmodulesOrgad Shaneh1-0/+1
2012-09-21git blame: document that it always follows origin across whole-file renamesJunio C Hamano1-0/+6
2012-09-21receive-pack: drop "n/a" on unpacker errorsJeff King2-2/+2
2012-09-21receive-pack: send pack-processing stderr over sidebandJeff King1-2/+24
2012-09-21receive-pack: redirect unpack-objects stdout to /dev/nullJeff King1-1/+6
2012-09-20Merge branch 'nd/maint-diffstat-summary' into maintJunio C Hamano1-6/+4
2012-09-20Merge branch 'jw/doc-commit-title' into maintJunio C Hamano7-22/+31
2012-09-20Merge branch 'dg/run-command-child-cleanup' into maintJunio C Hamano1-6/+7
2012-09-20Merge branch 'jc/mailinfo-RE' into maintJunio C Hamano1-1/+3
2012-09-20Merge branch 'sn/ls-remote-get-url-doc' into maintJunio C Hamano2-1/+6
2012-09-20Merge branch 'nd/log-n-doc' into maintJunio C Hamano2-5/+4
2012-09-20Merge branch 'nd/maint-remote-remove' into maintJunio C Hamano5-9/+10
2012-09-20grep.c: make two symbols really file-scope static this timeJunio C Hamano1-2/+2
2012-09-20clone --single: limit the fetch refspec to fetched branchRalf Thielow3-18/+218
2012-09-20Documentation: Document signature showing optionsStephen Boyd2-0/+7
2012-09-20Enable info/refs gzip decompression in HTTP clientShawn O. Pearce3-3/+5
2012-09-20Revert "retry request without query when info/refs?query fails"Shawn O. Pearce1-16/+2
2012-09-20completion: fix shell expansion of itemsFelipe Contreras1-1/+8
2012-09-19Documentation/Makefile: Allow custom XMLTO binaryDave Borowitz1-2/+3
2012-09-19Doc branch: show -vv option and alternativePhilip Oakley1-1/+3
2012-09-18Doc clean: add See Also linkPhilip Oakley1-0/+4
2012-09-18Doc add: link gitignorePhilip Oakley1-1/+1
2012-09-18Doc: separate gitignore pattern sourcesPhilip Oakley1-12/+18
2012-09-18Doc: shallow clone deepens _to_ new depthPhilip Oakley1-1/+2
2012-09-18Git 1.7.12.1v1.7.12.1Junio C Hamano3-2/+14
2012-09-18Merge branch 'er/doc-fast-import-done' into maintJunio C Hamano1-1/+7
2012-09-18Merge branch 'jk/config-warn-on-inaccessible-paths' into maintJunio C Hamano6-10/+34
2012-09-18t/test-lib: make sure Git has already been builtRamkumar Ramachandra2-10/+9
2012-09-18Doc: Improve shallow depth wordingPhilip Oakley1-2/+4
2012-09-18Documentation/git-filter-branch: Move note about effect of removing commitsAndreas Schwab1-10/+9
2012-09-17mailinfo: do not concatenate charset= attribute values from mime headersJunio C Hamano6-4/+32
2012-09-17t/perf: add "trash directory" to .gitignoreRamkumar Ramachandra1-2/+3
2012-09-17Add missing -z to git check-attr usage text for consistency with man pageAdam Spiers1-1/+1
2012-09-17git-jump: ignore (custom) prefix in diff modeMischa POSLAWSKY1-2/+2
2012-09-17Documentation: indent-with-non-tab uses "equivalent tabs" not 8Wesley J. Landaker1-2/+3
2012-09-16completion: add --no-edit to git-commitYacine Belkadi1-1/+2
2012-09-15t7810-grep: test --all-match with multiple --grep and --author optionsMichael J Gruber1-0/+20
2012-09-15t7810-grep: test interaction of multiple --grep and --author optionsMichael J Gruber1-16/+22
2012-09-15t7810-grep: test multiple --author with --all-matchMichael J Gruber1-0/+8
2012-09-15t7810-grep: test multiple --grep with and without --all-matchMichael J Gruber1-0/+16
2012-09-15t7810-grep: bring log --grep tests in common formMichael J Gruber1-6/+18
2012-09-15grep.c: mark private file-scope symbols as staticJunio C Hamano2-3/+6
2012-09-14Draft release notes to 1.7.12.1Junio C Hamano1-47/+69
2012-09-14Merge branch 'sb/send-email-reconfirm-fix' into maintJunio C Hamano1-2/+4
2012-09-14Merge branch 'jc/send-email-reconfirm' into maintJunio C Hamano1-3/+13
2012-09-14Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano8-11/+60
2012-09-14Sync with 1.7.11.7Junio C Hamano13-14/+147
2012-09-14Git 1.7.11.7v1.7.11.7Junio C Hamano4-3/+50
2012-09-14Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11Junio C Hamano2-1/+13
2012-09-14Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11Junio C Hamano2-3/+20
2012-09-14Merge branch 'rj/test-regex' into maint-1.7.11Junio C Hamano4-0/+27
2012-09-14Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11Junio C Hamano1-8/+9
2012-09-14Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11Junio C Hamano2-1/+30
2012-09-14log: document use of multiple commit limiting optionsJunio C Hamano1-5/+18
2012-09-14log --grep/--author: honor --all-match honored for multiple --grep patternsJunio C Hamano1-0/+19
2012-09-14grep: show --debug output only onceMichael J Gruber1-0/+1
2012-09-14grep: teach --debug option to dump the parse treeJunio C Hamano4-2/+96
2012-09-14Revert diffstat back to EnglishNguyễn Thái Ngọc Duy1-6/+4
2012-09-13attr: failure to open a .gitattributes file is OK with ENOTDIRJunio C Hamano1-1/+1
2012-09-13Documentation: describe subject more preciselyJeremy White7-22/+31
2012-09-12Further merging in preparation for 1.7.12.1Junio C Hamano1-0/+26
2012-09-12Merge branch 'maint-1.7.11' into maintJunio C Hamano19-162/+321
2012-09-12Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2-46/+76
2012-09-12Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano5-4/+56
2012-09-12Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....Junio C Hamano1-3/+3
2012-09-12Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Junio C Hamano9-106/+171
2012-09-12Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2-1/+13
2012-09-12ll-merge: warn about inability to merge binary files only when we can'tJunio C Hamano1-3/+4
2012-09-11blame: allow "blame file" in the middle of a conflicted mergeJunio C Hamano2-25/+70
2012-09-11Further merging down for 1.7.12.1Junio C Hamano1-0/+13
2012-09-11Sync with 1.7.11.6Junio C Hamano32-392/+569
2012-09-11Merge branch 'js/use-sc-open-max' into maintJunio C Hamano1-7/+19
2012-09-11Merge branch 'js/no-curl-easy-strerror-on-old-curl' into maintJunio C Hamano1-0/+2
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 'rr/precompose-utf8-cleanup' into maintJunio C Hamano1-25/+19
2012-09-11Merge branch 'jc/capabilities' into maintJunio C Hamano8-17/+102
2012-09-11Merge branch 'jc/doc-git-updates' into maintJunio C Hamano1-28/+32
2012-09-11Merge branch 'jk/check-docs-update' into maintJunio C Hamano6-29/+18
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-11Merge branch 'jc/test-prereq' into maintJunio C Hamano6-205/+233
2012-09-11run-command.c: fix broken list iteration in clear_child_for_cleanupDavid Gould1-6/+7
2012-09-10blame $path: avoid getting fooled by case insensitive filesystemsJunio C Hamano2-4/+16
2012-09-10Start preparing for 1.7.12.1Junio C Hamano2-1/+63
2012-09-10Merge branch 'bc/prune-info' into maintJunio C Hamano1-1/+2
2012-09-10Merge branch 'maint-1.7.11' into maintJunio C Hamano27-43/+288
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-09-10gitcli: contrast wildcard given to shell and to gitJunio C Hamano1-0/+17
2012-09-10gitcli: formatting fixJunio C Hamano1-1/+1
2012-09-09mailinfo: strip "RE: " prefixJunio C Hamano1-1/+3
2012-09-08attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano3-3/+3
2012-09-08merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano3-7/+35
2012-09-08gitk: Rename 'tagcontents' to 'cached_tagcontent'David Aguilar1-7/+7
2012-09-08gitk: Teach "Reread references" to reload tagsDavid Aguilar1-1/+2
2012-09-07ls-remote: document the '--get-url' optionStefan Naewe2-1/+6
2012-09-07fetch --all: pass --tags/--no-tags through to each remoteDan Johnson2-0/+34
2012-09-06send-email: initial_to and initial_reply_to are both optionalStephen Boyd1-2/+4
2012-09-06doc: move rev-list option -<n> from git-log.txt to rev-list-options.txtNguyễn Thái Ngọc Duy2-5/+4
2012-09-06remote: prefer subcommand name 'remove' to 'rm'Nguyễn Thái Ngọc Duy5-9/+10
2012-09-04Document file-glob for "git checkout -- '*.c'"Junio C Hamano1-0/+12
2012-09-02submodule: use argv_array instead of hand-building arraysJens Lehmann3-17/+19
2012-09-02fetch: use argv_array instead of hand-building arraysJeff King1-22/+25
2012-09-02argv-array: fix bogus cast when freeing arrayJeff King1-1/+1
2012-09-02argv-array: add pop functionJeff King3-0/+14
2012-09-02test-regex: Add a test to check for a bug in the regex routinesRamsay Jones4-0/+27
2012-08-31split_ident_line(): make best effort when parsing author/committer lineJunio C Hamano2-3/+20
2012-08-30cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk3-3/+7
2012-08-30demonstrate broken 'git cherry-pick three one two'Martin von Zweigbergk1-0/+15
2012-08-30teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk6-9/+40
2012-08-28log: fix --quiet synonym for -sJeff King2-1/+13
2012-08-27http: prompt for credentials on failed POSTJeff King2-9/+16
2012-08-27http: factor out http error code handlingJeff King2-23/+29
2012-08-27t: test http access to "half-auth" repositoriesJeff King3-0/+28
2012-08-27t: test basic smart-http authenticationJeff King2-0/+25
2012-08-27t/lib-httpd: recognize */smart/* repos as smart-httpJeff King1-9/+7
2012-08-27t/lib-httpd: only route auth/dumb to dumb reposJeff King1-1/+1
2012-08-27t5550: factor out http auth setupJeff King3-54/+55
2012-08-27t5550: put auth-required repo in auth/dumbJeff King1-9/+9
2012-08-26doc: "git checkout -b/-B/--orphan" always takes a branch nameJunio C Hamano1-3/+3
2012-08-24apply: compute patch->def_name correctly under -p0Junio C Hamano2-46/+76
2012-08-24Merge branch 'maint-1.7.11' into maintJunio C Hamano19-48/+231
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