summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-12-27Git 1.8.0.3v1.8.0.3Junio C Hamano4-3/+18
2012-12-27git(1): show link to contributor summary pageJunio C Hamano1-1/+4
2012-12-27Merge branch 'sl/maint-git-svn-docs' into maintJunio C Hamano1-6/+85
2012-12-27git-svn: Note about tags.Sebastian Leske1-0/+6
2012-12-27git-svn: Expand documentation for --follow-parentSebastian Leske1-3/+12
2012-12-27git-svn: Recommend use of structure options.Sebastian Leske1-3/+21
2012-12-27git-svn: Document branches with at-sign(@).Sebastian Leske1-0/+46
2012-12-27Merge branch 'gb/maint-doc-svn-log-window-size' into maintJunio C Hamano1-0/+7
2012-12-27Merge branch 'km/maint-doc-git-reset' into maintJunio C Hamano1-4/+4
2012-12-27git-remote-helpers.txt: document invocation before input formatMax Horn1-31/+31
2012-12-27Merge branch 'jk/avoid-mailto-invalid-in-doc' into maintJunio C Hamano3-3/+3
2012-12-27Merge branch 'tj/maint-doc-commit-sign' into maintJunio C Hamano1-1/+5
2012-12-27Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2-6/+6
2012-12-22Merge branch 'jc/doc-diff-blobs' into maintJunio C Hamano1-2/+7
2012-12-22Merge branch 'cr/doc-checkout-branch' into maintJunio C Hamano1-10/+41
2012-12-22Merge branch 'ta/api-index-doc' into maintJunio C Hamano1-2/+0
2012-12-22Merge branch 'as/doc-for-devs' into maintJunio C Hamano2-13/+16
2012-12-22Merge branch 'sl/readme-gplv2' into maintJunio C Hamano1-3/+4
2012-12-22Merge branch 'jc/fetch-tags-doc' into maintJunio C Hamano1-8/+5
2012-12-22Merge branch 'nd/index-format-doc' into maintJunio C Hamano1-2/+3
2012-12-22Merge branch 'jk/mailmap-cleanup' into maintJunio C Hamano2-33/+82
2012-12-22Merge branch 'ta/doc-cleanup' into maintJunio C Hamano20-68/+134
2012-12-22Sort howto documents in howto-index.txtThomas Ackermann1-1/+1
2012-12-18Documentation: Describe "git diff <blob> <blob>" separatelyJunio C Hamano1-2/+7
2012-12-18t7004: do not create unneeded gpghome/gpg.conf when GPG is not usedJunio C Hamano1-1/+4
2012-12-18Documentation/git-checkout.txt: document 70c9ac2 behaviorChris Rorvick1-0/+8
2012-12-18Documentation/git-checkout.txt: clarify usageChris Rorvick1-10/+33
2012-12-18Merge branch 'jk/pickaxe-textconv' into maintJunio C Hamano2-19/+54
2012-12-18clarify -M without % symbol in diff-optionsSitaram Chamarty1-1/+5
2012-12-16Documentation: move support for old compilers to CodingGuidelinesAdam Spiers2-13/+8
2012-12-16SubmittingPatches: add convention of prefixing commit messagesAdam Spiers1-0/+8
2012-12-16Documentation: don't link to example mail addressesJohn Keeping3-3/+3
2012-12-16Remove misleading date from api-index-skel.txtThomas Ackermann1-2/+0
2012-12-15README: it does not matter who the current maintainer isJunio C Hamano1-3/+2
2012-12-15README: Git is released under the GPLv2, not just "the GPL"Stefano Lattarini1-1/+3
2012-12-13fetch --tags: clarify documentationJunio C Hamano1-8/+5
2012-12-13Fix sizeof usage in get_permutationsMatthew Daley1-3/+3
2012-12-13git.txt: add missing info about --git-dir command-line optionManlio Perillo1-0/+1
2012-12-13index-format.txt: clarify what is "invalid"Nguyễn Thái Ngọc Duy1-2/+3
2012-12-12contrib: update stats/mailmap scriptJeff King1-32/+64
2012-12-12.mailmap: normalize emails for Linus TorvaldsJeff King1-0/+6
2012-12-12.mailmap: normalize emails for Jeff KingJeff King1-0/+1
2012-12-12.mailmap: fix broken entry for Martin LanghoffJeff King1-1/+1
2012-12-12.mailmap: match up some obvious names/emailsJeff King1-0/+10
2012-12-11git-prompt: Document GIT_PS1_DESCRIBE_STYLEAnders Kaseorg1-0/+9
2012-12-10Git 1.8.0.2v1.8.0.2Junio C Hamano2-2/+3
2012-12-10Documentation/git-stash.txt: add a missing verbSébastien Loriot1-1/+1
2012-12-09git(1): remove a defunct link to "list of authors"Junio C Hamano1-2/+1
2012-12-07Update draft release notes to 1.8.0.2Junio C Hamano1-0/+19
2012-12-07Merge branch 'jc/doc-push-satellite' into maintJunio C Hamano1-2/+14
2012-12-07Merge branch 'jc/same-encoding' into maintJunio C Hamano6-4/+13
2012-12-07Merge branch 'lt/diff-stat-show-0-lines' into maintJunio C Hamano4-58/+110
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-29t4049: refocus testsJunio C Hamano1-11/+9
2012-11-28Start preparing for 1.8.0.2Junio C Hamano2-1/+16
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-27Documentation/git-push.txt: clarify the "push from satellite" workflowJunio C Hamano1-2/+14
2012-11-27diff --shortstat: do not count "unmerged" entriesJunio C Hamano1-3/+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-27Documentation: improve phrasing in git-push.txtMark Szepieniec1-1/+2
2012-11-26Fix typo in remote set-head usageAntoine Pelisse1-1/+1
2012-11-26Makefile: hide stderr of curl-config testPaul Gortmaker1-1/+1
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-20compat/fnmatch: fix off-by-one character class's length checkNguyễn Thái Ngọc Duy1-1/+1
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-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-15config: don't segfault when given --path with a missing valueCarlos Martín Nieto2-1/+7
2012-11-15checkout: print a message when switching unborn branchesJeff King1-0/+3
2012-11-12gitweb: escape html in rss titleJeff King2-0/+16
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-08push/pull: adjust missing upstream help text to changed interfaceMichael J Gruber1-1/+1
2012-11-04reencode_string(): introduce and use same_encoding()Junio C Hamano6-4/+12
2012-11-02commit: fixup misplacement of --no-post-rewrite descriptionAndreas Schwab1-4/+3
2012-11-02Document 'git commit --no-edit' explicitlyMatthieu Moy1-0/+5
2012-10-29Add -S, --gpg-sign option to manpage of "git commit"Tom Jones1-1/+5
2012-10-29doc: git-reset: make "<mode>" optionalKrzysztof Mazur1-4/+4
2012-10-28pickaxe: use textconv for -S countingJeff King2-17/+51
2012-10-28pickaxe: hoist empty needle checkJeff King1-2/+3
2012-10-28diff_grep: use textconv buffers for add/deleted filesJeff King2-2/+14
2012-10-28mailmap: avoid out-of-bounds memory accessRomain Francoise1-1/+1
2012-10-26Document git-svn fetch --log-window-size parameterGunnlaugur Þór Briem1-0/+7
2012-10-25Doc repository-layout: Show refs/replacePhilip Oakley1-0/+6
2012-10-25Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy4-6/+6
2012-10-25Documentation: build html for all files in technical and howtoThomas Ackermann1-2/+24
2012-10-25git-pull: Avoid merge-base on detached headPhil Hord1-0/+1
2012-10-25git-submodule: wrap branch option with "<>" in usage strings.W. Trevor King2-2/+2
2012-10-21Git 1.8.0v1.8.0Junio C Hamano3-10/+19
2012-10-21Fix failure to delete a packed ref through a symrefJohan Herland2-2/+2
2012-10-21t1400-update-ref: Add test verifying bug with symrefs in delete_ref()Johan Herland1-0/+18
2012-10-19Fix potential hang in https handshakeStefan Zager1-0/+12
2012-10-18branch: show targets of deleted symrefs, not sha1sRené Scharfe2-11/+13
2012-10-18branch: skip commit checks when deleting symref branchesRené Scharfe2-2/+17
2012-10-18branch: delete symref branch, not its targetRené Scharfe2-1/+12
2012-10-18branch: factor out delete_branch_config()René Scharfe1-5/+10
2012-10-18branch: factor out check_branch_commit()René Scharfe1-12/+21
2012-10-18format-patch tests: check quoting/encoding in To: and Cc: headersJan H. Schönherr1-32/+66
2012-10-18format-patch: fix rfc2047 address encoding with respect to rfc822 specialsJan H. Schönherr2-18/+33
2012-10-18format-patch: make rfc2047 encoding more strictJan H. Schönherr3-12/+72
2012-10-18format-patch: introduce helper function last_line_length()Jan H. Schönherr1-12/+13
2012-10-18format-patch: do not wrap rfc2047 encoded headers too lateJan H. Schönherr2-33/+51
2012-10-18format-patch: do not wrap non-rfc2047 headers too earlyJan H. Schönherr2-27/+35
2012-10-18utf8: fix off-by-one wrapping of textJan H. Schönherr2-3/+3
2012-10-18Documentation/howto: convert plain text files to asciidocThomas Ackermann11-34/+68
2012-10-17Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-guiJunio C Hamano15-37/+65
2012-10-17git-gui 0.17gitgui-0.17.0Pat Thoyts1-1/+1
2012-10-17git-gui: Don't prepend the prefix if value looks like a full pathAndrew Wong1-2/+7
2012-10-17git-gui: Detect full path when parsing argumentsAndrew Wong1-1/+10
2012-10-17Fix "git diff --stat" for interesting - but empty - file changesLinus Torvalds4-36/+42
2012-10-17Git 1.8.0-rc3v1.8.0-rc3Junio C Hamano2-5/+4
2012-10-17Merge git://github.com/git-l10n/git-poJunio C Hamano2-914/+913
2012-10-17Sync with 1.7.12.4Junio C Hamano2-1/+25
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-17Merge branch 'master' of https://github.com/nafmo/git-l10n-svJiang Xin1-441/+438
2012-10-17Merge branch 'master' of git://github.com/vnwildman/gitJiang Xin1-473/+475
2012-10-17l10n: vi.po: update from v1.8.0-rc2-4-g42e55Tran Ngoc Quan1-473/+475
2012-10-16Documentation/technical: convert plain text files to asciidocThomas Ackermann5-27/+34
2012-10-16Change headline of technical/send-pack-pipeline.txt to not confuse its conten...Thomas Ackermann1-2/+2
2012-10-16Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1Thomas Ackermann1-2/+2
2012-10-16Split over-long synopsis in git-fetch-pack.txt into several linesThomas Ackermann1-1/+4
2012-10-16Documentation/RelNotes: remove "updated up to this revision" markersThomas Ackermann5-25/+0
2012-10-16Update draft release notes to 1.8.0Junio C Hamano1-0/+7
2012-10-16Merge branch 'jk/maint-http-half-auth-push'Junio C Hamano3-6/+6
2012-10-16refs: lock symref that is to be deleted, not its targetRené Scharfe1-13/+5
2012-10-16l10n: Update Swedish translation (1964t0f0u)Peter Krefting1-441/+438
2012-10-16l10n: Update git.pot (3 new, 6 removed messages)Jiang Xin1-437/+415
2012-10-16Merge branch 'master' of git://github.com/vnwildman/gitJiang Xin1-672/+4096
2012-10-15l10n: vi.po: update translation upto cc76011Tran Ngoc Quan1-672/+4096
2012-10-13Merge branch 'maint'Junio C Hamano1-1/+1
2012-10-13Fix spelling error in post-receive-email hookRichard Fearn1-1/+1
2012-10-12Merge branch 'maint'Junio C Hamano1-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-12grep: stop looking at random places for .gitattributesNguyễn Thái Ngọc Duy4-17/+51
2012-10-11mergetools/p4merge: Handle "/dev/null"David Aguilar1-0/+25
2012-10-11Git 1.8.0-rc2v1.8.0-rc2Junio C Hamano1-1/+1
2012-10-11test-lib: Fix say_color () not to interpret \a\b\c in the messageJunio C Hamano1-1/+1
2012-10-10Merge branch 'rr/git-uri-doc'Junio C Hamano1-2/+6
2012-10-10Merge branch 'bw/cp-a-is-gnuism'Junio C Hamano3-3/+3
2012-10-10Merge branch 'nd/doc-ignore'Junio C Hamano1-1/+5
2012-10-10Merge branch 'jc/doc-long-options'Junio C Hamano1-1/+11
2012-10-10Sync with maintJunio C Hamano1-0/+5
2012-10-10Merge git://bogomips.org/git-svnJunio C Hamano2-2/+25
2012-10-10svn test: escape peg revision separator using empty peg revJonathan Nieder1-1/+1
2012-10-10git svn: work around SVN 1.7 mishandling of svn:special changesJonathan Nieder1-1/+24
2012-10-10MALLOC_CHECK: Allow checking to be disabled from config.makRamsay Jones1-0/+1
2012-10-10attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy1-0/+5
2012-10-09log --grep: use the same helper to set -E/-F options as "git grep"Junio C Hamano2-2/+8
2012-10-09revisions: initialize revs->grep_filter using grep_init()Junio C Hamano2-2/+9
2012-10-09grep: move pattern-type bits support to top-level grep.[ch]Junio C Hamano3-39/+45
2012-10-09grep: move the configuration parsing logic to grep.[ch]Junio C Hamano3-131/+134
2012-10-09builtin/grep.c: make configuration callback more reusableJunio C Hamano1-25/+79
2012-10-09Merge branch 'maint'Junio C Hamano1-7/+7
2012-10-09configure.ac: Add missing comma to CC_LD_DYNPATHØyvind A. Holm1-1/+1
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