summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-03-13Git 1.8.2v1.8.2Junio C Hamano2-1/+6
2013-03-11Merge branch 'maint'Junio C Hamano1-2/+2
2013-03-11git.c: make usage match manual pageKevin Bracey1-2/+2
2013-03-11Merge branch 'mp/complete-paths'Junio C Hamano1-5/+11
2013-03-11Merge branch 'mm/add-u-A-finishing-touches'Junio C Hamano1-3/+3
2013-03-11git-completion.bash: zsh does not implement function redirection correctlyMatthieu Moy1-5/+11
2013-03-11Merge branch 'gp/add-u-A-documentation'Junio C Hamano1-10/+12
2013-03-11add: update pathless 'add [-u|-A]' warning to reflect change of planMatthieu Moy1-3/+3
2013-03-10Merge branch 'maint'Junio C Hamano1-1/+1
2013-03-10Translate git_more_info_string consistentlyKevin Bracey1-1/+1
2013-03-09Merge branch 'maint'Junio C Hamano1-1/+1
2013-03-09perf: update documentation of GIT_PERF_REPEAT_COUNTAntoine Pelisse1-1/+1
2013-03-08Merge git://git.bogomips.org/git-svnJunio C Hamano1-1/+6
2013-03-08Update draft release notes to 1.8.2Junio C Hamano1-26/+34
2013-03-08git svn: consistent spacing after "W:" in warningsEric Wong1-1/+1
2013-03-08git svn: ignore partial svn:mergeinfoJan Pešta1-0/+5
2013-03-07Git 1.8.2-rc3v1.8.2-rc3Junio C Hamano1-1/+1
2013-03-07Merge git://github.com/git-l10n/git-poJunio C Hamano5-27/+29
2013-03-07Merge branch 'mp/complete-paths'Junio C Hamano1-0/+9
2013-03-07Merge branch 'maint'Junio C Hamano1-3/+0
2013-03-07Merge branch 'mh/maint-ceil-absolute' into maintJunio C Hamano3-16/+52
2013-03-07gitweb/README: remove reference to git.kernel.orgFredrik Gustafsson1-3/+0
2013-03-07add: Clarify documentation of -A and -uGreg Price1-10/+12
2013-03-07l10n: zh_CN.po: translate 1 new messageJiang Xin1-4/+4
2013-03-06l10n: de.po: translate 1 new messageRalf Thielow1-7/+9
2013-03-06l10n: vi.po: Update translation (2009t0f0u)Tran Ngoc Quan1-10/+10
2013-03-05git-completion.zsh: define __gitcomp_file compatibility functionMatthieu Moy1-0/+9
2013-03-05l10n: Update Swedish translation (2009t0f0u)Peter Krefting1-4/+4
2013-03-05l10n: git.pot: v1.8.2 round 4 (1 changed)Jiang Xin1-2/+2
2013-03-04Merge git://github.com/git-l10n/git-poJunio C Hamano1-636/+821
2013-03-03Git 1.8.2-rc2v1.8.2-rc2Junio C Hamano2-5/+27
2013-03-01Sync with 1.8.1.5Junio C Hamano5-6/+16
2013-03-01Git 1.8.1.5v1.8.1.5Junio C Hamano3-2/+9
2013-03-01Make !pattern in .gitattributes non-fatalThomas Rast2-4/+7
2013-03-01Merge branch 'wk/user-manual' into maintJunio C Hamano1-56/+77
2013-03-01Documentation/githooks: Fix linkgitAndrew Wong1-1/+1
2013-02-27Merge branch 'maint'Junio C Hamano2-3/+8
2013-02-27Update draft release notes to 1.8.1.5Junio C Hamano1-1/+5
2013-02-27Merge branch 'ef/non-ascii-parse-options-error-diag' into maintJunio C Hamano1-1/+4
2013-02-27Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maintJunio C Hamano1-3/+4
2013-02-27Merge branch 'jn/less-reconfigure' into maintJunio C Hamano1-6/+8
2013-02-27Merge branch 'mh/maint-ceil-absolute'Junio C Hamano3-16/+52
2013-02-27Documentation/submodule: Add --force to update synopsisBrad King1-1/+1
2013-02-26Merge branch 'for-junio' of git://github.com/kusma/gitJunio C Hamano1-131/+75
2013-02-26Revert "compat: add strtok_r()"Erik Faye-Lund5-80/+0
2013-02-26wincred: improve compatibility with windows versionsKarsten Blees1-129/+70
2013-02-26wincred: accept CRLF on stdin to simplify console usageKarsten Blees1-2/+5
2013-02-26l10n: de.po: correct translation of "bisect" messagesRalf Thielow1-9/+9
2013-02-26l10n: de.po: translate 5 new messagesRalf Thielow1-109/+145
2013-02-26l10n: de.po: translate 35 new messagesRalf Thielow1-618/+767
2013-02-25Git 1.8.2-rc1v1.8.2-rc1Junio C Hamano2-14/+10
2013-02-25Merge git://github.com/git-l10n/git-poJunio C Hamano4-948/+1200
2013-02-25Sync with 'maint'Junio C Hamano3-2/+39
2013-02-25Merge branch 'wk/user-manual'Junio C Hamano1-56/+77
2013-02-25Merge branch 'jn/less-reconfigure'Junio C Hamano1-6/+8
2013-02-25Merge branch 'as/check-ignore'Junio C Hamano3-3/+18
2013-02-25Merge branch 'ct/autoconf-htmldir'Junio C Hamano1-0/+2
2013-02-25Merge branch 'wk/man-deny-current-branch-is-default-these-days'Junio C Hamano1-1/+1
2013-02-25Prepare for 1.8.1.5Junio C Hamano2-1/+38
2013-02-25Merge branch 'jc/mention-tracking-for-pull-default' into maintJunio C Hamano1-1/+2
2013-02-25Merge branch 'mm/config-intro-in-git-doc' into maintJunio C Hamano1-6/+5
2013-02-25Merge branch 'da/p4merge-mktemp-fix' into maintJunio C Hamano1-1/+1
2013-02-25Merge branch 'bw/get-tz-offset-perl' into maintJunio C Hamano4-13/+35
2013-02-25Merge branch 'al/mergetool-printf-fix' into maintJunio C Hamano2-2/+2
2013-02-25Merge branch 'jx/utf8-printf-width' into maintJunio C Hamano3-2/+25
2013-02-25Merge branch 'mg/bisect-doc' into maintJunio C Hamano1-1/+6
2013-02-25Merge branch 'sp/smart-http-content-type-check' into maintJunio C Hamano8-17/+59
2013-02-25Merge branch 'jc/combine-diff-many-parents' into maintJunio C Hamano2-14/+31
2013-02-25Merge branch 'jk/apply-similaritly-parsing' into maintJunio C Hamano1-4/+6
2013-02-25Merge branch 'jk/remote-helpers-doc' into maintJunio C Hamano5-7/+23
2013-02-25Merge branch 'ab/gitweb-use-same-scheme' into maintJunio C Hamano1-2/+2
2013-02-25Merge branch 'zk/clean-report-failure' into maintJunio C Hamano1-29/+125
2013-02-25Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintJunio C Hamano1-0/+2
2013-02-25Merge branch 'da/p4merge-mktemp' into maintJunio C Hamano1-14/+13
2013-02-25Documentation: "advice" is uncountableGreg Price2-2/+2
2013-02-22Provide a mechanism to turn off symlink resolution in ceiling pathsMichael Haggerty3-16/+52
2013-02-20Makefile: avoid infinite loop on configure.ac changeJeff King1-6/+8
2013-02-19Sync with v1.8.1.4Junio C Hamano3-3/+78
2013-02-19Git 1.8.1.4v1.8.1.4Junio C Hamano4-3/+15
2013-02-19Merge branch 'ob/imap-send-ssl-verify' into maintJunio C Hamano1-2/+65
2013-02-19imap-send: support subjectAltName as wellOswald Buddenhagen1-0/+19
2013-02-19imap-send: the subject of SSL certificate must match the hostOswald Buddenhagen1-0/+39
2013-02-20l10n: vi.po: Updated 5 new messages (2009t0f0u)Tran Ngoc Quan1-112/+143
2013-02-19Bugfix: undefined htmldir in config.mak.autogenJiang Xin1-0/+2
2013-02-19name-hash: allow hashing an empty stringJunio C Hamano3-3/+8
2013-02-19user-manual: Flesh out uncommitted changes and submodule updatesW. Trevor King1-1/+3
2013-02-19user-manual: Use request-pull to generate "please pull" textW. Trevor King1-9/+5
2013-02-19user-manual: Reorganize the reroll sections, adding 'git rebase -i'W. Trevor King1-46/+69
2013-02-19t0008: document test_expect_success_multiAdam Spiers1-0/+10
2013-02-19l10n: Update Swedish translation (2009t0f0u)Peter Krefting1-101/+130
2013-02-19l10n: Update Swedish translation (2004t0f0u)Peter Krefting1-620/+765
2013-02-19l10n: zh_CN.po: translate 5 new messagesJiang Xin1-106/+128
2013-02-19l10n: git.pot: v1.8.2 round 3 (5 new)Jiang Xin1-100/+125
2013-02-18imap-send: move #ifdef aroundJunio C Hamano1-2/+7
2013-02-18Merge branch 'jc/mention-tracking-for-pull-default'Junio C Hamano1-1/+2
2013-02-18Merge branch 'mm/config-intro-in-git-doc'Junio C Hamano1-6/+5
2013-02-18RelNotes 1.8.2: push-simple will not be in effect in this releaseJunio C Hamano1-2/+14
2013-02-18shell-prompt: clean up nested if-thenMartin Erik Werner1-14/+13
2013-02-18user-manual: typofix (ofthe->of the)Junio C Hamano1-1/+1
2013-02-18Merge branch 'maint'Junio C Hamano1-40/+55
2013-02-18user-manual: use -o latest.tar.gz to create a gzipped tarballW. Trevor King1-3/+12
2013-02-18user-manual: use 'git config --global user.*' for setupW. Trevor King1-5/+13
2013-02-18user-manual: mention 'git remote add' for remote branch configW. Trevor King1-27/+13
2013-02-18user-manual: give 'git push -f' as an alternative to +masterW. Trevor King1-0/+7
2013-02-18user-manual: use 'remote add' to setup push URLsW. Trevor King1-5/+10
2013-02-18Merge git://github.com/git-l10n/git-poJunio C Hamano3-1873/+2284
2013-02-18l10n: zh_CN.po: translate 35 new messagesJiang Xin1-625/+767
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-17l10n: vi.po: update new strings (2004t0u0f)Tran Ngoc Quan1-647/+795
2013-02-15Update draft release notes to 1.8.2Junio C Hamano1-0/+12
2013-02-15git.txt: update description of the configuration mechanismMatthieu Moy1-6/+5
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-14l10n: Update git.pot (35 new, 14 removed messages)Jiang Xin1-601/+722
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