summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-12-03Git 1.8.1-rc0v1.8.1-rc0Junio C Hamano2-12/+14
2012-12-03Merge branch 'mm/status-push-pull-advise'Junio C Hamano1-6/+9
2012-12-03status: respect advice.statusHints for ahead/behind adviceJeff King1-6/+9
2012-11-29Update draft release notes to 1.8.1Junio C Hamano1-1/+32
2012-11-29Merge branch 'pw/p4-various-fixes'Junio C Hamano3-20/+137
2012-11-29Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2-28/+74
2012-11-29Merge branch 'fc/remote-hg'Junio C Hamano6-1/+1639
2012-11-29Merge branch 'mk/complete-tcsh'Junio C Hamano1-7/+12
2012-11-29Merge branch 'jc/doc-push-satellite'Junio C Hamano1-2/+14
2012-11-29Merge branch 'km/send-email-remove-cruft-in-address'Junio C Hamano1-18/+59
2012-11-29Merge branch 'jk/send-email-sender-prompt'Junio C Hamano9-26/+169
2012-11-29Merge branch 'fc/send-email-no-sender-prompt'Junio C Hamano2-9/+3
2012-11-29Merge branch 'er/doc-add-new-commands'Junio C Hamano1-0/+99
2012-11-29Merge branch 'jl/submodule-rm'Junio C Hamano2-0/+32
2012-11-29Merge branch 'pp/gitweb-config-underscore'Junio C Hamano1-2/+5
2012-11-29Merge branch 'fc/completion-test-simplification'Junio C Hamano1-82/+52
2012-11-29Merge branch 'maint'Junio C Hamano3-5/+45
2012-11-29git-fast-import.txt: improve documentation for quoted pathsMatthieu Moy1-2/+6
2012-11-29git-remote-mediawiki: escape ", \, and LF in file namesMatthieu Moy2-3/+39
2012-11-29Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano1-834/+896
2012-11-29t4049: refocus testsJunio C Hamano1-11/+9
2012-11-29completion: fix warning for zshFelipe Contreras1-0/+2
2012-11-29Merge git://github.com/vnwildman/gitJiang Xin1-834/+896
2012-11-28Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano3-1970/+2097
2012-11-28Merge branch 'maint'Junio C Hamano2-0/+17
2012-11-28Update draft release notes to 1.8.1Junio C Hamano1-1/+10
2012-11-28Merge branch 'fc/zsh-completion'Junio C Hamano2-43/+139
2012-11-28Merge branch 'mm/status-push-pull-advise'Junio C Hamano2-3/+11
2012-11-28Merge branch 'jk/pickaxe-textconv'Junio C Hamano2-19/+54
2012-11-28Start preparing for 1.8.0.2Junio C Hamano2-1/+16
2012-11-28t9001: check send-email behavior with implicit senderJeff King1-0/+28
2012-11-28Merge branch 'rh/maint-gitweb-highlight-ext' into maintJunio C Hamano1-9/+8
2012-11-28Merge branch 'pw/maint-p4-rcs-expansion-newline' into maintJunio C Hamano2-1/+20
2012-11-28completion: add options --single-branch and --branch to "git clone"Ralf Thielow1-0/+2
2012-11-28Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-sender-promptJunio C Hamano2-9/+3
2012-11-28t: add tests for "git var"Jeff King1-0/+49
2012-11-27Documentation/git-push.txt: clarify the "push from satellite" workflowJunio C Hamano1-2/+14
2012-11-27remote-hg: fix for older versions of pythonFelipe Contreras1-4/+8
2012-11-27remote-hg: fix for files with spacesFelipe Contreras1-1/+1
2012-11-27diff --shortstat: do not count "unmerged" entriesJunio C Hamano1-3/+2
2012-11-27Merge branch 'maint'Junio C Hamano1-1/+2
2012-11-27Merge branch 'nd/maint-compat-fnmatch-fix' into maintJunio C Hamano1-1/+1
2012-11-27Merge branch 'jh/update-ref-d-through-symref' into maintJunio C Hamano2-1/+19
2012-11-27Merge branch 'esr/maint-doc-fast-import' into maintJunio C Hamano1-2/+6
2012-11-27Merge branch 'wtk/submodule-doc-fixup' into maintJunio C Hamano2-2/+2
2012-11-27diff --stat: do not count "unmerged" entriesJunio C Hamano2-3/+5
2012-11-27diff --stat: move the "total count" logic to the last loopJunio C Hamano2-10/+13
2012-11-27diff --stat: use "file" temporary variable to refer to data->files[i]Junio C Hamano1-13/+13
2012-11-27diff --stat: status of unmodified pair in diff-q is not zeroJunio C Hamano1-1/+1
2012-11-27test: add failing tests for "diff --stat" to t4049Junio C Hamano1-1/+45
2012-11-27Support for git aliasing for tcsh completionMarc Khouzam1-7/+12
2012-11-27Documentation: improve phrasing in git-push.txtMark Szepieniec1-1/+2
2012-11-26git-send-email: allow edit invalid email addressKrzysztof Mazur1-3/+6
2012-11-26git-send-email: ask what to do with an invalid email addressKrzysztof Mazur1-2/+10
2012-11-26git-send-email: remove invalid addresses earlierKrzysztof Mazur1-13/+39
2012-11-26Merge branch 'maint'Junio C Hamano2-2/+2
2012-11-26Documentation: how to add a new commandEric S. Raymond1-0/+99
2012-11-26Fix typo in remote set-head usageAntoine Pelisse1-1/+1
2012-11-26send-email: avoid questions when user has an identFelipe Contreras2-9/+3
2012-11-26git p4: remove unneeded cmd initializationPete Wyckoff1-1/+0
2012-11-26git p4: fix labelDetails typo in exceptionPete Wyckoff1-1/+1
2012-11-26git p4 test: display unresolvable host errorPete Wyckoff1-0/+12
2012-11-26git p4: catch p4 errors when streaming file contentsPete Wyckoff2-8/+43
2012-11-26git p4: handle servers without move supportPete Wyckoff2-1/+55
2012-11-26git p4: catch p4 describe errorsPete Wyckoff1-9/+26
2012-11-26Makefile: hide stderr of curl-config testPaul Gortmaker1-1/+1
2012-11-26emacs: make 'git-status' work with separate git dirsEnrico Scholz1-1/+1
2012-11-26git-send-email: fix fallback code in extract_valid_address()Krzysztof Mazur1-5/+5
2012-11-26git-send-email: remove garbage after email addressKrzysztof Mazur1-0/+4
2012-11-25Update draft release notes to 1.8.1Junio C Hamano1-0/+14
2012-11-25Merge branch 'rr/submodule-diff-config'Junio C Hamano7-24/+98
2012-11-25Merge branch 'nd/maint-compat-fnmatch-fix'Junio C Hamano1-1/+1
2012-11-25Merge branch 'bc/do-not-recurse-in-die'Junio C Hamano1-0/+15
2012-11-25Merge branch 'mk/complete-tcsh'Junio C Hamano1-0/+63
2012-11-25Merge branch 'jh/update-ref-d-through-symref'Junio C Hamano2-1/+19
2012-11-25Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano4-36/+42
2012-11-25Merge branch 'sg/complete-help-undup'Junio C Hamano1-1/+1
2012-11-25Sync with 1.8.0.1Junio C Hamano4-4/+17
2012-11-25Git 1.8.0.1v1.8.0.1Junio C Hamano3-3/+16
2012-11-25Merge branch 'jk/checkout-out-of-unborn' into maintJunio C Hamano1-0/+3
2012-11-25Merge branch 'cn/config-missing-path' into maintJunio C Hamano2-1/+7
2012-11-25Merge branch 'jk/maint-gitweb-xss' into maintJunio C Hamano2-0/+16
2012-11-24Completion must sort before using uniqMarc Khouzam1-1/+1
2012-11-23Teach rm to remove submodules when given with a trailing '/'Jens Lehmann2-0/+32
2012-11-24l10n: vi.po: Update follow git-v1.8.0-273-g2d242Tran Ngoc Quan1-834/+896
2012-11-23l10n: Update Swedish translation (1975t0f0u)Peter Krefting1-589/+657
2012-11-23l10n: vi.po: update to git-v1.7.12-437-g1084fTran Ngoc Quan1-798/+799
2012-11-23l10n: Update git.pot (14 new, 3 removed messages)Jiang Xin1-583/+641
2012-11-21Update draft release notes for 1.8.1Junio C Hamano1-0/+10
2012-11-21Merge branch 'esr/maint-doc-fast-import'Junio C Hamano1-2/+6
2012-11-21Merge branch 'wtk/submodule-doc-fixup'Junio C Hamano2-2/+2
2012-11-21Merge branch 'so/prompt-command'Junio C Hamano1-8/+90
2012-11-21Merge branch 'jk/config-ignore-duplicates'Junio C Hamano4-196/+232
2012-11-21Merge branch 'jk/maint-http-half-auth-fetch'Junio C Hamano1-1/+1
2012-11-21gitweb: make remote_heads config setting workPhil Pennock1-2/+5
2012-11-21remote-curl.c: Fix a compiler warningRamsay Jones1-1/+1
2012-11-20compat/fnmatch: fix off-by-one character class's length checkNguyễn Thái Ngọc Duy1-1/+1
2012-11-20Sixth batch for 1.8.1Junio C Hamano1-3/+39
2012-11-20Merge branch 'ml/cygwin-mingw-headers'Junio C Hamano2-0/+11
2012-11-20Merge branch 'jk/checkout-out-of-unborn'Junio C Hamano1-0/+3
2012-11-20Merge branch 'cn/config-missing-path'Junio C Hamano2-1/+7
2012-11-20Merge branch 'jl/submodule-rm'Junio C Hamano1-15/+15
2012-11-20Merge branch 'mg/replace-resolve-delete'Junio C Hamano2-6/+20
2012-11-20Merge branch 'jk/maint-gitweb-xss'Junio C Hamano2-0/+16
2012-11-20Merge branch 'rh/maint-gitweb-highlight-ext'Junio C Hamano1-9/+8
2012-11-20Merge branch 'pw/maint-p4-rcs-expansion-newline'Junio C Hamano2-1/+20
2012-11-20Merge branch 'mh/alt-odb-string-list-cleanup'Junio C Hamano1-28/+22
2012-11-20Merge branch 'ta/doc-cleanup'Junio C Hamano20-68/+134
2012-11-20Merge branch 'kb/preload-index-more'Junio C Hamano3-6/+15
2012-11-20Merge branch 'jk/maint-http-half-auth-fetch'Junio C Hamano3-8/+39
2012-11-20Sync with maintJunio C Hamano1-1/+7
2012-11-20Further preparation for 1.8.0.1Junio C Hamano1-1/+7
2012-11-20Merge branch 'mg/maint-pull-suggest-upstream-to' into maintJunio C Hamano1-1/+1
2012-11-20Merge branch 'mm/maint-doc-commit-edit' into maintJunio C Hamano1-0/+5
2012-11-20Merge branch 'as/maint-doc-fix-no-post-rewrite' into maintJunio C Hamano1-4/+3
2012-11-20Merge branch 'rs/lock-correct-ref-during-delete' into maintJunio C Hamano1-13/+5
2012-11-20Merge branch 'rf/maint-mailmap-off-by-one' into maintJunio C Hamano1-1/+1
2012-11-20Merge branch 'jk/maint-diff-grep-textconv' into maintJunio C Hamano2-2/+14
2012-11-20Merge branch 'js/format-2047' into maintJunio C Hamano5-126/+262
2012-11-19completion: start moving to the new zsh completionFelipe Contreras1-43/+61
2012-11-19completion: add new zsh completionFelipe Contreras1-0/+78
2012-11-18USE CGYWIN_V15_WIN32API as macro to select api for cygwinMark Levedahl2-4/+4
2012-11-18Sync with maintJunio C Hamano1-0/+46
2012-11-18Start preparing for 1.8.0.1Junio C Hamano2-1/+47
2012-11-18Merge branch 'sz/maint-curl-multi-timeout' into maintJunio C Hamano1-0/+12
2012-11-18Merge branch 'po/maint-refs-replace-docs' into maintJunio C Hamano1-0/+6
2012-11-18Merge branch 'ph/pull-rebase-detached' into maintJunio C Hamano1-0/+1
2012-11-18Merge branch 'mm/maint-doc-remote-tracking' into maintJunio C Hamano4-6/+6
2012-11-18Merge branch 'rs/branch-del-symref' into maintJunio C Hamano2-26/+68
2012-11-18Merge branch 'nd/grep-true-path' into maintJunio C Hamano4-17/+51
2012-11-18Merge branch 'jc/grep-pcre-loose-ends' (early part) into maintJunio C Hamano5-128/+204
2012-11-18Merge branch 'da/mergetools-p4' into maintJunio C Hamano1-0/+25
2012-11-18Merge branch 'jc/test-say-color-avoid-echo-escape' into maintJunio C Hamano1-1/+1
2012-11-18Merge branch 'bw/config-lift-variable-name-length-limit' into maintJunio C Hamano1-30/+29
2012-11-18submodule: display summary header in boldRamkumar Ramachandra3-6/+6
2012-11-18diff: rename "set" variableJeff King2-6/+21
2012-11-18diff: introduce diff.submodule configuration variableRamkumar Ramachandra4-6/+65
2012-11-18Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2-6/+6
2012-11-16tcsh-completion re-using git-completion.bashMarc Khouzam1-0/+63
2012-11-16status: add advice on how to push/pull to tracking branchMatthieu Moy2-3/+11
2012-11-16completion: simplify __gitcomp() test helperFelipe Contreras1-10/+5
2012-11-16completion: refactor __gitcomp related testsFelipe Contreras1-50/+28
2012-11-16completion: consolidate test_completion*() testsFelipe Contreras1-17/+14
2012-11-16completion: simplify tests using test_completion_long()Felipe Contreras1-6/+3
2012-11-16completion: standardize final space marker in testsFelipe Contreras1-14/+13
2012-11-16completion: add comment for test_completion()Felipe Contreras1-1/+5
2012-11-15config: don't segfault when given --path with a missing valueCarlos Martín Nieto2-1/+7
2012-11-15usage.c: detect recursion in die routines and bail out immediatelyBrandon Casey1-0/+15
2012-11-15ident: keep separate "explicit" flags for author and committerJeff King3-10/+29
2012-11-15ident: make user_ident_explicitly_given staticJeff King2-5/+5
2012-11-15t7502: factor out autoident prerequisiteJeff King2-11/+7
2012-11-15test-lib: allow negation of prerequisitesJeff King2-1/+52
2012-11-15checkout: print a message when switching unborn branchesJeff King1-0/+3
2012-11-15Start 1.8.1 cycleJunio C Hamano2-1/+152
2012-11-15Merge branch 'jc/prettier-pretty-note'Junio C Hamano13-47/+100
2012-11-15Merge branch 'mg/maint-pull-suggest-upstream-to'Junio C Hamano1-1/+1
2012-11-15Merge branch 'mh/notes-string-list'Junio C Hamano4-37/+49
2012-11-15Merge branch 'mh/strbuf-split'Junio C Hamano3-29/+74
2012-11-15Merge branch 'mm/maint-doc-commit-edit'Junio C Hamano1-0/+5
2012-11-15Merge branch 'as/maint-doc-fix-no-post-rewrite'Junio C Hamano1-4/+3
2012-11-15Merge branch 'js/hp-nonstop'Junio C Hamano1-0/+4
2012-11-15Merge branch 'cr/cvsimport-local-zone'Junio C Hamano6-9/+372
2012-11-15Merge branch 'jc/same-encoding'Junio C Hamano6-4/+13
2012-11-15Merge branch 'ph/submodule-sync-recursive'Junio C Hamano2-4/+65
2012-11-15Merge branch 'jk/maint-diff-grep-textconv'Junio C Hamano2-2/+14
2012-11-15Merge branch 'jh/symbolic-ref-d'Junio C Hamano3-11/+62
2012-11-15Merge branch 'jc/maint-fetch-tighten-refname-check'Junio C Hamano1-2/+2
2012-11-14docs: move submodule sectionMatt Kraai1-15/+15
2012-11-14completion: remove 'help' duplicate from porcelain commandsSZEDER Gábor1-1/+1
2012-11-13format-patch: add a blank line between notes and diffstatJunio C Hamano1-10/+21
2012-11-13replace: parse revision argument for -dMichael J Gruber2-6/+20
2012-11-12gitweb: escape html in rss titleJeff King2-0/+16
2012-11-12Update cygwin.c for new mingw-64 win32 api headersMark Levedahl2-0/+11
2012-11-12remote-hg: avoid bad refsFelipe Contreras1-0/+3
2012-11-12remote-hg: try the 'tip' if no checkout presentFelipe Contreras1-0/+2
2012-11-12remote-hg: fix compatibility with older versions of hgFelipe Contreras1-1/+1
2012-11-12remote-hg: add missing config for basic testsRamkumar Ramachandra1-0/+9
2012-11-09Merge branch 'ph/maint-submodule-status-fix'Jeff King2-5/+3
2012-11-09Merge branch 'nd/builtin-to-libgit'Jeff King22-1497/+1535
2012-11-09Merge branch 'nd/tree-walk-enum-cleanup'Jeff King1-4/+4
2012-11-09Merge branch 'sz/maint-curl-multi-timeout'Jeff King1-0/+12
2012-11-09Merge branch 'fc/completion-send-email-with-format-patch'Jeff King2-17/+23
2012-11-09Merge branch 'mo/cvs-server-cleanup'Jeff King3-215/+440
2012-11-09Merge branch 'km/send-email-compose-encoding'Jeff King3-5/+116
2012-11-09Merge branch 'js/format-2047'Jeff King5-126/+262
2012-11-09Merge branch 'rs/lock-correct-ref-during-delete'Jeff King1-13/+5
2012-11-09Merge branch 'nd/attr-match-optim-more'Jeff King6-88/+186
2012-11-09Merge branch 'mh/maint-parse-dirstat-fix'Jeff King1-19/+21
2012-11-08doc/fast-import: clarify how content states are builtEric S. Raymond1-2/+6
2012-11-08gitweb.perl: fix %highlight_ext mappingsRichard Hubbell1-9/+8
2012-11-08git p4: RCS expansion should not span newlinesPete Wyckoff2-1/+20
2012-11-08link_alt_odb_entries(): take (char *, len) rather than two pointersMichael Haggerty1-5/+5
2012-11-08link_alt_odb_entries(): use string_list_split_in_place()Michael Haggerty1-24/+18
2012-11-08string_list_add_refs_from_colon_sep(): use string_list_split()Michael Haggerty1-13/+8
2012-11-08notes: fix handling of colon-separated valuesMichael Haggerty1-2/+2
2012-11-08combine_notes_cat_sort_uniq(): sort and dedup lines all at onceMichael Haggerty1-22/+16
2012-11-08Initialize sort_uniq_list using named constantMichael Haggerty1-1/+1
2012-11-08string_list: add a function string_list_remove_empty_items()Michael Haggerty3-1/+24
2012-11-08push/pull: adjust missing upstream help text to changed interfaceMichael J Gruber1-1/+1
2012-11-04remote-hg: the author email can be nullFelipe Contreras1-3/+3