summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-02-17Git 1.8.2-rc0v1.8.2-rc0Junio C Hamano2-1/+14
2013-02-17Merge branch 'jc/hidden-refs'Junio C Hamano7-30/+166
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano6-1/+95
2013-02-17Merge branch 'mw/bash-prompt-show-untracked-config'Junio C Hamano2-4/+85
2013-02-17Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2-40/+58
2013-02-17Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2-7/+78
2013-02-15Update draft release notes to 1.8.2Junio C Hamano1-0/+12
2013-02-14Merge branch 'wk/man-deny-current-branch-is-default-these-days'Junio C Hamano1-3/+4
2013-02-14Merge branch 'mk/make-rm-depdirs-could-be-empty'Junio C Hamano1-2/+1
2013-02-14Merge branch 'mm/config-local-completion'Junio C Hamano1-2/+2
2013-02-14Merge branch 'ef/non-ascii-parse-options-error-diag'Junio C Hamano1-1/+4
2013-02-14Merge branch 'mk/old-expat'Junio C Hamano3-0/+11
2013-02-14Merge branch 'da/p4merge-mktemp-fix'Junio C Hamano1-1/+1
2013-02-14Documentation/git-add: kill remaining <filepattern>Junio C Hamano1-1/+1
2013-02-14user-manual: Update for receive.denyCurrentBranch=refuseW. Trevor King1-3/+4
2013-02-14Update draft release notes to 1.8.2Junio C Hamano1-0/+9
2013-02-14Merge branch 'jk/diff-graph-cleanup'Junio C Hamano4-114/+79
2013-02-14Merge branch 'nd/status-show-in-progress'Junio C Hamano3-41/+142
2013-02-14Merge branch 'mm/remote-mediawiki-build'Junio C Hamano4-43/+43
2013-02-14Merge branch 'bw/get-tz-offset-perl'Junio C Hamano4-13/+35
2013-02-14Merge branch 'al/mergetool-printf-fix'Junio C Hamano2-2/+2
2013-02-14Merge branch 'jk/error-const-return'Junio C Hamano1-5/+5
2013-02-14Merge branch 'jx/utf8-printf-width'Junio C Hamano3-2/+25
2013-02-14Merge branch 'mg/bisect-doc'Junio C Hamano1-1/+6
2013-02-14Merge branch 'tz/perl-styles'Junio C Hamano1-0/+42
2013-02-14Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano1-2/+38
2013-02-14Merge branch 'dg/subtree-fixes'Junio C Hamano4-66/+40
2013-02-13t9903: add extra tests for bash.showDirtyStateMartin Erik Werner1-1/+37
2013-02-13t9903: add tests for bash.showUntrackedFilesMartin Erik Werner1-0/+40
2013-02-13Makefile: don't run "rm" without any filesMatt Kraai1-2/+1
2013-02-13shell prompt: add bash.showUntrackedFiles optionMartin Erik Werner1-3/+8
2013-02-12Merge branch 'maint'Junio C Hamano3-8/+8
2013-02-12rebase -i: respect core.commentcharJohn Keeping2-40/+58
2013-02-12combine-diff.c: teach combined diffs about line prefixJohn Keeping1-17/+30
2013-02-12diff.c: use diff_line_prefix() where applicableJohn Keeping1-95/+20
2013-02-12diff: add diff_line_prefix functionJohn Keeping2-0/+13
2013-02-12diff.c: make constant string arguments constJohn Keeping1-2/+4
2013-02-12diff: write prefix to the correct fileJohn Keeping1-1/+1
2013-02-12completion: support 'git config --local'Matthieu Moy1-2/+2
2013-02-12Replace filepattern with pathspec for consistencyMatthieu Moy3-8/+8
2013-02-11parse-options: report uncorrupted multi-byte optionsErik Faye-Lund1-1/+4
2013-02-11Allow building with xmlparse.hMatt Kraai3-0/+11
2013-02-11log: re-encode commit messages before greppingJeff King2-7/+78
2013-02-11Add utf8_fprintf helper that returns correct number of columnsJiang Xin3-2/+25
2013-02-11git-bisect.txt: clarify that reset quits bisectMichael J Gruber1-1/+6
2013-02-10Update draft release notes to 1.8.2Junio C Hamano1-0/+25
2013-02-10Merge branch 'maint'Junio C Hamano1-16/+10
2013-02-10user-manual: Rewrite git-gc section for automatic packingW. Trevor King1-12/+6
2013-02-10user-manual: Fix 'you - Git' -> 'you--Git' typoW. Trevor King1-1/+1
2013-02-10user-manual: Fix 'http' -> 'HTTP' typosW. Trevor King1-3/+3
2013-02-10Merge branch 'sp/smart-http-content-type-check'Junio C Hamano8-17/+59
2013-02-10user-manual: Fix 'both: so' -> 'both; so' typoW. Trevor King1-1/+1
2013-02-10p4merge: fix printf usageDavid Aguilar1-1/+1
2013-02-10difftool--helper: fix printf usageDavid Aguilar1-1/+1
2013-02-09cvsimport: format commit timestamp ourselves without using strftimeBen Walton1-1/+4
2013-02-09perl/Git.pm: fix get_tz_offset to properly handle DST boundary casesBen Walton1-3/+3
2013-02-09Move Git::SVN::get_tz to Git::get_tz_offsetBen Walton3-12/+31
2013-02-09Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano6-4559/+4728
2013-02-08Merge branch 'jc/combine-diff-many-parents'Junio C Hamano2-14/+31
2013-02-08Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano1-4/+6
2013-02-08Merge branch 'mk/tcsh-complete-only-known-paths'Junio C Hamano1-0/+12
2013-02-08Merge branch 'mp/complete-paths'Junio C Hamano1-15/+240
2013-02-08Merge branch 'ct/autoconf-htmldir'Junio C Hamano1-0/+1
2013-02-08git-mergetool: print filename when it contains %Asheesh Laroia1-1/+1
2013-02-08l10n: de.po: translate "reset" as "neu setzen"Ralf Thielow1-8/+8
2013-02-08l10n: de.po: translate "revision" consistently as "Revision"Ralf Thielow1-9/+9
2013-02-08l10n: de.po: translate 11 new messagesRalf Thielow1-650/+722
2013-02-08git-remote-mediawiki: use toplevel's MakefileMatthieu Moy3-40/+11
2013-02-08Makefile: make script-related rules usable from subdirectoriesMatthieu Moy1-3/+32
2013-02-09l10n: zh_CN.po: 800+ new translations on command usagesWang Sheng2-2136/+2123
2013-02-08Use __VA_ARGS__ for all of error's argumentsMatt Kraai1-5/+5
2013-02-07Update draft release notes to 1.8.2Junio C Hamano1-5/+15
2013-02-07Sync with 1.8.1.3Junio C Hamano2-1/+22
2013-02-07Git 1.8.1.3v1.8.1.3Junio C Hamano3-2/+23
2013-02-07Merge branch 'mz/pick-unborn' into maintJunio C Hamano10-48/+44
2013-02-07Merge branch 'nd/fix-perf-parameters-in-tests' into maintJunio C Hamano1-1/+1
2013-02-07Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into...Junio C Hamano2-2/+34
2013-02-07Merge branch 'ft/transport-report-segv' into maintJunio C Hamano1-1/+1
2013-02-07Merge branch 'sb/gpg-plug-fd-leak' into maintJunio C Hamano1-1/+3
2013-02-07Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano3-17/+45
2013-02-07Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maintJunio C Hamano1-2/+3
2013-02-07Merge branch 'da/mergetool-docs'Junio C Hamano5-72/+159
2013-02-07Merge branch 'ss/mergetools-tortoise'Junio C Hamano1-4/+21
2013-02-07Merge branch 'jk/mergetool'Junio C Hamano8-133/+100
2013-02-07Merge branch 'jk/doc-makefile-cleanup'Junio C Hamano1-9/+30
2013-02-07Merge branch 'jk/remote-helpers-doc'Junio C Hamano5-7/+23
2013-02-07Merge branch 'sb/run-command-fd-error-reporting'Junio C Hamano1-2/+6
2013-02-07Merge branch 'nd/branch-error-cases'Junio C Hamano4-21/+64
2013-02-07Merge branch 'sb/gpg-i18n'Junio C Hamano1-3/+3
2013-02-07Merge branch 'jk/python-styles'Junio C Hamano1-0/+14
2013-02-07Merge branch 'ab/gitweb-use-same-scheme'Junio C Hamano1-2/+2
2013-02-07upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano7-1/+146
2013-02-07graph: output padding for merge subsequent parentsJohn Keeping1-0/+10
2013-02-06Update CodingGuidelines for PerlTed Zlatanov1-0/+42
2013-02-06http_request: reset "type" strbuf before addingJeff King1-0/+1
2013-02-05Update draft release notes to 1.8.2Junio C Hamano1-0/+24
2013-02-05Merge branch 'jn/auto-depend-workaround-buggy-ccache'Junio C Hamano1-2/+3
2013-02-05Merge branch 'ta/doc-no-small-caps'Junio C Hamano137-959/+982
2013-02-05Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano3-17/+45
2013-02-05Merge branch 'sb/gpg-plug-fd-leak'Junio C Hamano1-1/+3
2013-02-05Merge branch 'ft/transport-report-segv'Junio C Hamano1-1/+1
2013-02-05contrib/subtree: make the manual directory if neededJesper L. Nielsen1-0/+1
2013-02-05contrib/subtree: honor DESTDIRAdam Tkac1-2/+2
2013-02-05contrib/subtree: fix synopsisDavid A. Greene2-1/+8
2013-02-05contrib/subtree: better error handling for 'subtree add'David A. Greene1-3/+9
2013-02-05contrib/subtree: use %B for split subject/bodyTechlive Zheng2-5/+20
2013-02-05contrib/subtree: remove test number commentsDavid A. Greene1-55/+0
2013-02-05t4038: add tests for "diff --cc --raw <trees>"John Keeping1-0/+24
2013-02-05apply: verify submodule commit object name betterJunio C Hamano1-2/+38
2013-02-05status: show the branch name if possible in in-progress infoNguyễn Thái Ngọc Duy3-41/+142
2013-02-04t5551: fix expected error outputJunio C Hamano1-2/+1
2013-02-04Update draft release notes to 1.8.2Junio C Hamano1-9/+25
2013-02-04Merge branch 'maint'Junio C Hamano1-0/+28
2013-02-04Merge branch 'jk/remote-helpers-in-python-3'Junio C Hamano6-29/+69
2013-02-04Merge branch 'pw/git-p4-on-cygwin'Junio C Hamano10-105/+332
2013-02-04Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano5-53/+85
2013-02-04Merge branch 'mm/add-u-A-sans-pathspec'Junio C Hamano2-4/+47
2013-02-04Merge branch 'jc/push-reject-reasons'Junio C Hamano11-30/+107
2013-02-04Merge branch 'jk/config-parsing-cleanup'Junio C Hamano10-99/+117
2013-02-04Merge branch 'jc/custom-comment-char'Junio C Hamano20-78/+284
2013-02-04Verify Content-Type from smart HTTP serversShawn Pearce8-17/+59
2013-02-04Start preparing for 1.8.1.3Junio C Hamano2-1/+29
2013-02-04Merge branch 'bc/git-p4-for-python-2.4' into maintJunio C Hamano3-11/+35
2013-02-04Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano1-4/+4
2013-02-04Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maintJunio C Hamano1-1/+5
2013-02-04Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maintJunio C Hamano1-0/+6
2013-02-04Merge branch 'dl/am-hg-locale' into maintJunio C Hamano1-1/+1
2013-02-04Merge branch 'jc/help' into maintJunio C Hamano2-18/+17
2013-02-04Merge branch 'jc/merge-blobs' into maintJunio C Hamano8-51/+118
2013-02-04Merge branch 'jc/doc-maintainer' into maintJunio C Hamano1-91/+256
2013-02-04Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' into maintJunio C Hamano1-1/+1
2013-02-03completion: handle path completion and colon for tcsh scriptMarc Khouzam1-0/+12
2013-02-03builtin/apply: tighten (dis)similarity index parsingJohn Keeping1-4/+6
2013-02-03combine-diff: lift 32-way limit of combined diffJunio C Hamano1-14/+7
2013-02-02doc: generate a list of valid merge toolsDavid Aguilar5-15/+36
2013-02-02mergetool--lib: list user configured tools in '--tool-help'John Keeping1-1/+40
2013-02-02mergetool--lib: add functions for finding available toolsDavid Aguilar1-36/+65
2013-02-02Honor configure's htmldir switchChristoph J. Thompson1-1/+2
2013-02-01Makefile: explicitly set target name for autogenerated dependenciesJonathan Nieder1-2/+3
2013-02-01mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth1-3/+11
2013-02-01Rename {git- => git}remote-helpers.txtJohn Keeping5-7/+23
2013-02-01run-command: be more informative about what failedStephen Boyd1-2/+6
2013-02-01Documentation: StGit is the right spelling, not StGITThomas Ackermann1-2/+2
2013-02-01Documentation: describe the "repository" in repository-layoutJunio C Hamano1-6/+18
2013-02-01Documentation: add a description for 'gitfile' to glossaryThomas Ackermann1-0/+4
2013-02-01Documentation: do not use undefined terms git-dir and git-fileThomas Ackermann1-3/+5
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann128-902/+902
2013-02-01Documentation: avoid poor-man's small caps GITThomas Ackermann28-48/+53
2013-02-01Update draft release notes to 1.8.2Junio C Hamano1-1/+41
2013-02-01Merge branch 'nd/edit-branch-desc-while-detached'Junio C Hamano1-4/+4
2013-02-01Merge branch 'jk/gc-auto-after-fetch'Junio C Hamano2-0/+8
2013-02-01Merge branch 'bc/git-p4-for-python-2.4'Junio C Hamano3-11/+35
2013-02-01Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname'Junio C Hamano1-1/+5
2013-02-01Merge branch 'jk/cvsimport-does-not-work-with-cvsps3'Junio C Hamano1-0/+6
2013-02-01Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests'Junio C Hamano2-2/+34
2013-02-01Merge branch 'as/test-cleanup'Junio C Hamano1-20/+21
2013-02-01Merge branch 'jc/no-git-config-in-clone'Junio C Hamano1-9/+0
2013-02-01Merge branch 'nd/fetch-depth-is-broken'Junio C Hamano8-12/+85
2013-02-01Documentation/Makefile: clean up MAN*_TXT listsJeff King1-9/+29
2013-01-31apply: diagnose incomplete submodule object name betterJunio C Hamano1-1/+5
2013-01-31apply: simplify build_fake_ancestor()Junio C Hamano1-14/+12
2013-01-31git-am: record full index line in the patch used while rebasingJunio C Hamano2-3/+29
2013-01-31branch: let branch filters imply --listJeff King3-3/+41
2013-01-31docs: clarify git-branch --list behaviorJeff King1-7/+9
2013-01-31gpg: close stderr once finished with it in verify_signed_buffer()Stephen Boyd1-1/+3
2013-01-31gpg: allow translation of more error messagesStephen Boyd1-3/+3
2013-01-31push: fix segfault when HEAD points nowhereFraser Tweedale1-1/+1
2013-01-30Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2-2/+16
2013-01-30CodingGuidelines: add Python coding guidelinesJohn Keeping1-0/+14
2013-01-30git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean"Junio C Hamano1-1/+1
2013-01-30INSTALL: git-p4 does not support Python 3Junio C Hamano1-2/+3
2013-01-30branch: mark more strings for translationNguyễn Thái Ngọc Duy1-5/+6
2013-01-30Merge branch 'nd/edit-branch-desc-while-detached' into HEADJunio C Hamano1-4/+4
2013-01-30branch: give a more helpful message on redundant argumentsNguyễn Thái Ngọc Duy2-4/+4
2013-01-30branch: reject -D/-d without branch nameNguyễn Thái Ngọc Duy1-2/+4
2013-01-30branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy1-4/+4
2013-01-30Merge branch 'rr/minimal-stat'Junio C Hamano5-10/+28
2013-01-30Merge branch 'nd/magic-pathspec-from-root'Junio C Hamano3-3/+25
2013-01-30Merge branch 'maint'Junio C Hamano1-8/+7
2013-01-30Merge branch 'tb/t0050-maint' into maintJunio C Hamano1-35/+17
2013-01-30gitk: Ignore gitk-wish buildproductChristian Couder2-2/+16
2013-01-29mergetool--lib: improve the help text in guess_merge_tool()David Aguilar1-1/+7
2013-01-29mergetool--lib: simplify command expressionsDavid Aguilar1-23/+15
2013-01-29Merge branch 'nd/fix-directory-attrs-off-by-one' into maintJunio C Hamano1-20/+18
2013-01-29Merge branch 'ph/rebase-preserve-all-merges' into maintJunio C Hamano1-1/+6
2013-01-29README: update stale and/or incorrect informationJunio C Hamano1-8/+7
2013-01-28upload-pack: simplify request validationJunio C Hamano1-17/+11
2013-01-28mergetools: simplify how we handle "vim" and "defaults"David Aguilar6-52/+34
2013-01-28gitweb: refer to picon/gravatar images over the same schemeAndrej E Baranov1-2/+2
2013-01-28Update draft release notes to 1.8.2Junio C Hamano1-30/+12
2013-01-28Sync with 1.8.1.2Junio C Hamano1-0/+12
2013-01-28Git 1.8.1.2v1.8.1.2Junio C Hamano2-1/+13
2013-01-28Merge branch 'ss/help-htmlpath-config-doc' into maintJunio C Hamano1-0/+6
2013-01-28Merge branch 'nd/attr-debug-fix' into maintJunio C Hamano1-1/+1
2013-01-28Merge branch 'ds/completion-silence-in-tree-path-probe' into maintJunio C Hamano1-1/+1
2013-01-28Merge branch 'jn/maint-trim-vim-contrib' into maintJunio C Hamano1-13/+3
2013-01-28Merge branch 'pe/doc-email-env-is-trumped-by-config' into maintJunio C Hamano1-2/+2
2013-01-28Merge branch 'mk/complete-tcsh' into maintJunio C Hamano1-12/+21
2013-01-28Merge branch 'ap/status-ignored-in-ignored-directory' into maintJunio C Hamano3-22/+225
2013-01-28Merge branch 'er/stop-recommending-parsecvs' into maintJunio C Hamano1-4/+2