summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-05-13Git 1.8.3-rc2v1.8.3-rc2Junio C Hamano2-4/+9
2013-05-13Merge git://ozlabs.org/~paulus/gitkJunio C Hamano1-55/+199
2013-05-13gitk: On OSX, bring the gitk window to frontTair Sabirgaliev1-0/+9
2013-05-13gitk: Add support for -G'regex' pickaxe variantMartin Langhoff1-1/+4
2013-05-11test-bzr: do not use unportable sed '\+'Torsten Bögershausen1-1/+1
2013-05-11Merge git://git.bogomips.org/git-svnJunio C Hamano9-7/+196
2013-05-11gitk: Add menu item for reverting commitsKnut Franke1-0/+62
2013-05-11gitk: Simplify file filteringFelipe Contreras1-13/+7
2013-05-11gitk: Display the date of a tag in a human-friendly wayAnand Kumria1-1/+1
2013-05-11gitk: Improve behaviour of drop-down listsPaul Mackerras1-1/+6
2013-05-09Sync with v1.8.2.3Junio C Hamano5-8/+26
2013-05-09Git 1.8.2.3v1.8.2.3Junio C Hamano4-3/+23
2013-05-09Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano1-3/+3
2013-05-09cherry-pick: picking a tag that resolves to a commit is OKJunio C Hamano1-3/+3
2013-05-09Merge branch 'tr/copy-revisions-from-stdin' into maintJunio C Hamano1-1/+2
2013-05-09t5004: avoid using tar for checking emptiness of archiveRené Scharfe1-3/+2
2013-05-09t5004: ignore pax global header fileRené Scharfe1-1/+1
2013-05-09mergetools/kdiff3: do not use --auto when diffingDavid Aguilar1-1/+1
2013-05-09transport-helper: trivial style cleanupFelipe Contreras1-2/+1
2013-05-09git-svn: added an --include-path flagPaul Walmsley5-3/+180
2013-05-09Git::SVN::*: add missing "NAME" section to perldocJonathan Nieder4-0/+8
2013-05-09git-svn: avoid self-referencing mergeinfoMichael Contreras2-4/+8
2013-05-07Update draft release notes for 1.8.3Junio C Hamano1-2/+3
2013-05-07remote-helpers: trivial cleanupFelipe Contreras1-1/+0
2013-05-07remote-bzr: fix for disappeared revisionsFelipe Contreras2-4/+49
2013-05-07Merge git://github.com/git-l10n/git-poJunio C Hamano5-2669/+3650
2013-05-08l10n: zh_CN.po: translate 44 messages (2080t0f0u)Jiang Xin1-530/+728
2013-05-07l10n: de.po: translate 44 new messagesRalf Thielow1-554/+774
2013-05-06Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2-1/+56
2013-05-06merge-tree: handle directory/empty conflict correctlyJohn Keeping2-1/+56
2013-05-06Merge branch 'fc/remote-bzr'Junio C Hamano2-81/+298
2013-05-06remote-bzr: avoid bad refsFelipe Contreras1-15/+23
2013-05-06remote-bzr: convert all unicode keys to strFelipe Contreras1-2/+2
2013-05-05Merge branch 'fc/push-with-export-reporting-result'Junio C Hamano2-0/+15
2013-05-05transport-helper: improve push messagesFelipe Contreras2-0/+15
2013-05-03Git 1.8.3-rc1v1.8.3-rc1Junio C Hamano1-1/+1
2013-05-03Merge branch 'tr/unpack-entry-use-after-free-fix'Junio C Hamano1-1/+0
2013-05-03Sync with maintJunio C Hamano2-3/+3
2013-05-03Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano3-3/+25
2013-05-03Merge branch 'jn/glossary-revision' into maintJunio C Hamano1-3/+1
2013-05-03completion: zsh: don't override suffix on _detaultFelipe Contreras1-1/+1
2013-05-02Documentation/git-commit: Typo under --editAnders Granskogen Bjørnstad1-2/+2
2013-05-01Update draft release notes to 1.8.3Junio C Hamano1-3/+16
2013-05-01Fix grammar in the 1.8.3 release notes.Marc Branchaud1-78/+77
2013-05-01Merge branch 'hb/git-pm-tempfile'Junio C Hamano1-1/+1
2013-05-01Merge branch 'rs/pp-user-info-without-extra-allocation'Junio C Hamano1-35/+14
2013-05-01Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano3-3/+25
2013-05-01Merge branch 'zk/prompt-rebase-step'Junio C Hamano3-9/+31
2013-05-01Merge remote-tracking branch 'vi-vnwildman/master'Jiang Xin1-543/+747
2013-05-01l10n: Update Vietnamese translation (2080t0f0u)Tran Ngoc Quan1-543/+747
2013-04-30remote-bzr: access branches only when neededFelipe Contreras1-12/+16
2013-04-30remote-bzr: delay peer branch usageFelipe Contreras1-3/+3
2013-04-30remote-bzr: iterate revisions properlyFelipe Contreras1-2/+3
2013-04-30remote-bzr: improve progress reportingFelipe Contreras1-7/+13
2013-04-30remote-bzr: add option to specify branchesFelipe Contreras1-2/+18
2013-04-30remote-bzr: add custom method to find branchesFelipe Contreras1-5/+20
2013-04-30remote-bzr: improve author sanitazionFelipe Contreras1-2/+13
2013-04-30remote-bzr: add support for shared repoFelipe Contreras1-7/+15
2013-04-30remote-bzr: fix branch namesFelipe Contreras1-0/+1
2013-04-30remote-bzr: add support for bzr reposFelipe Contreras2-56/+138
2013-04-30remote-bzr: use branch variable when appropriateFelipe Contreras1-17/+18
2013-04-30remote-bzr: fix partially pushed mergeFelipe Contreras1-4/+13
2013-04-30remote-bzr: fixes for branch divergeFelipe Contreras1-1/+7
2013-04-30remote-bzr: add support to push mergesFelipe Contreras2-8/+57
2013-04-30remote-bzr: always try to update the worktreeFelipe Contreras1-1/+5
2013-04-30remote-bzr: fix order of locking in CustomTreeFelipe Contreras1-1/+1
2013-04-30remote-bzr: delay blob fetching until the very endFelipe Contreras1-3/+5
2013-04-30remote-bzr: cleanup CustomTreeFelipe Contreras1-7/+1
2013-04-30unpack_entry: avoid freeing objects in base cacheThomas Rast1-1/+0
2013-04-30l10n: Update Swedish translation (2080t0f0u)Peter Krefting1-537/+731
2013-04-30l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)Jiang Xin1-505/+670
2013-04-29git-completion.bash: add remote.pushdefault to config listRamkumar Ramachandra1-0/+5
2013-04-29git-completion.bash: add branch.*.pushremote to config listRamkumar Ramachandra1-2/+2
2013-04-29Merge branch 'maint'Junio C Hamano2-9/+136
2013-04-29Merge branch 'fc/zsh-completion' into maintJunio C Hamano1-8/+126
2013-04-29complete: zsh: use zsh completion for the main cmdFelipe Contreras1-1/+119
2013-04-29complete: zsh: trivial simplificationFelipe Contreras1-8/+8
2013-04-29git-completion.bash: complete branch.*.rebase as booleanRamkumar Ramachandra1-0/+4
2013-04-29git-completion.bash: add diff.submodule to config listRamkumar Ramachandra1-0/+5
2013-04-29git-completion.bash: lexical sorting for diff.statGraphWidthRamkumar Ramachandra1-1/+1
2013-04-29Git.pm: call tempfile from File::Temp as a regular functionH. Merijn Brand1-1/+1
2013-04-28Merge branch 'maint'Junio C Hamano2-44/+6
2013-04-28documentation: trivial whitespace cleanupsFelipe Contreras1-6/+6
2013-04-28t/Makefile: remove smoke test targetsJohn Keeping1-38/+0
2013-04-28Merge branch 'nd/pretty-formats'Junio C Hamano1-2/+2
2013-04-28pretty: Fix bug in truncation support for %>, %< and %><Ramsay Jones1-2/+2
2013-04-28Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano1-1/+1
2013-04-28clone: Make the 'junk_mode' symbol a file staticRamsay Jones1-1/+1
2013-04-28Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2-1/+14
2013-04-28merge-tree: fix typo in "both changed identically"John Keeping2-1/+14
2013-04-27completion: add missing format-patch optionsFelipe Contreras1-1/+2
2013-04-26Git 1.8.3-rc0v1.8.3-rc0Junio C Hamano2-19/+9
2013-04-26Merge branch 'rr/shortlog-doc'Junio C Hamano5-22/+35
2013-04-26Merge branch 'th/bisect-skipped-log'Junio C Hamano2-0/+30
2013-04-26Merge branch 'ph/rebase-original'Junio C Hamano2-1/+8
2013-04-26Merge branch 'jn/glossary-revision'Junio C Hamano1-3/+1
2013-04-26Merge branch 'jc/add-ignore-removal'Junio C Hamano2-10/+23
2013-04-26remote-bzr: strip extra newlineFelipe Contreras1-0/+4
2013-04-26remote-bzr: tell bazaar to be quietFelipe Contreras1-0/+3
2013-04-26remote-bzr: store converted URLFelipe Contreras1-1/+12
2013-04-26remote-hg: use hashlib instead of hg sha1 utilFelipe Contreras1-2/+2
2013-04-26remote-bzr: add support to push URLsFelipe Contreras1-3/+13
2013-04-26remote-bzr: fix bad state issueFelipe Contreras1-0/+6
2013-04-26remote-hg: remove extra checkFelipe Contreras1-4/+0
2013-04-26remote-helpers: trivial cleanupsFelipe Contreras2-4/+5
2013-04-26Merge branch 'fc/remote-hg'Junio C Hamano3-36/+141
2013-04-26Merge branch 'fc/remote-bzr'Junio C Hamano1-5/+5
2013-04-26Merge branch 'jc/warn-pathless-add-finishing-touches'Junio C Hamano1-0/+2
2013-04-26git add: avoid "-u/-A without pathspec" warning on stat-dirty pathsJunio C Hamano1-0/+2
2013-04-26Sync with 1.8.2.2Junio C Hamano7-20/+54
2013-04-26Git 1.8.2.2v1.8.2.2Junio C Hamano3-2/+21
2013-04-26Merge branch 'jk/a-thread-only-dies-once' into maintJunio C Hamano3-6/+26
2013-04-26Merge branch 'jn/gitweb-install-doc' into maintJunio C Hamano2-8/+12
2013-04-26Merge branch 'fc/untracked-zsh-prompt' into maintJunio C Hamano1-1/+1
2013-04-26Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maintJunio C Hamano1-1/+4
2013-04-26Merge branch 'jk/chopped-ident' into maintJunio C Hamano5-99/+75
2013-04-26Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2-7/+29
2013-04-26Merge branch 'rs/empty-archive' into maintJunio C Hamano1-1/+1
2013-04-26Merge branch 'pe/pull-rebase-v-q' into maintJunio C Hamano2-1/+28
2013-04-26t7409: do not use export X=YTorsten Bögershausen1-4/+10
2013-04-26test-hg-hg-git.sh: do not use export X=YTorsten Bögershausen1-4/+6
2013-04-26test-hg-bidi.sh: do not use export X=YTorsten Bögershausen1-5/+6
2013-04-26t9501: do not use export X=YTorsten Bögershausen1-5/+10
2013-04-26t9020: do not use export X=YTorsten Bögershausen1-1/+2
2013-04-25remote-bzr: use proper push methodFelipe Contreras1-5/+5
2013-04-25pretty: remove intermediate strbufs from pp_user_info()René Scharfe1-20/+9
2013-04-25pretty: simplify output line length calculation in pp_user_info()René Scharfe1-4/+3
2013-04-25pretty: simplify input line length calculation in pp_user_info()René Scharfe1-11/+2
2013-04-25bash-prompt.sh: show where rebase is at when stoppedZoltan Klinger3-9/+31
2013-04-24Merge branch 'jk/remote-helper-with-signed-tags'Junio C Hamano7-6/+50
2013-04-24Sync with maintJunio C Hamano3-9/+20
2013-04-24Update draft release notes to 1.8.2.2Junio C Hamano1-0/+18
2013-04-24Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano2-2/+9
2013-04-24Merge branch 'sr/log-SG-no-textconv' into maintJunio C Hamano2-72/+86
2013-04-24Merge branch 'jc/merge-tag-object' into maintJunio C Hamano2-32/+81
2013-04-24completion: remove duplicate block for "git commit -c"Mårten Kongstad1-7/+0
2013-04-24remote: 'show' and 'prune' can take more than one remoteThomas Rast2-10/+5
2013-04-24remote: check for superfluous arguments in 'git remote add'Thomas Rast2-2/+2
2013-04-24remote: add a test for extra arguments, according to docsThomas Rast1-0/+27
2013-04-24cherry-pick/revert: make usage say '<commit-ish>...'Kevin Bracey1-2/+2
2013-04-23Merge git://github.com/git-l10n/git-poJunio C Hamano5-4102/+5212
2013-04-23rebase: find orig_head unambiguouslyPhil Hord2-1/+8
2013-04-23Update draft release notes to 1.8.3Junio C Hamano1-0/+19
2013-04-23Merge branch 'nd/pretty-formats'Junio C Hamano14-125/+648
2013-04-23Merge branch 'kb/status-ignored-optim-2'Junio C Hamano12-364/+455
2013-04-23Merge branch 'jn/gitweb-install-doc'Junio C Hamano2-8/+12
2013-04-23Merge branch 'fc/untracked-zsh-prompt'Junio C Hamano1-1/+1
2013-04-23Merge branch 'jk/receive-pack-deadlocks-with-early-failure'Junio C Hamano1-1/+4
2013-04-23bisect: Log possibly bad, skipped commits at bisection endTorstein Hegge2-0/+30
2013-04-22remote-hg: strip extra newlineFelipe Contreras1-0/+4
2013-04-22remote-hg: use marks instead of inlined filesFelipe Contreras1-8/+33
2013-04-22remote-hg: small performance improvementFelipe Contreras1-1/+2
2013-04-22remote-hg: allow refs with spacesFelipe Contreras1-8/+17
2013-04-22remote-hg: don't update bookmarks unnecessarilyFelipe Contreras1-0/+3
2013-04-22remote-hg: add support for schemes extensionFelipe Contreras1-1/+7
2013-04-22remote-hg: improve email sanitationFelipe Contreras2-6/+12
2013-04-22remote-hg: add custom local tag write codeFelipe Contreras1-1/+3
2013-04-22remote-hg: write tags in the appropriate branchFelipe Contreras1-2/+4
2013-04-22remote-hg: custom method to write tagsFelipe Contreras1-1/+32
2013-04-22remote-hg: add support for tag objectsFelipe Contreras1-3/+7
2013-04-22remote-hg: add branch_tip() helperFelipe Contreras1-3/+8
2013-04-22remote-hg: properly mark branches up-to-dateFelipe Contreras1-0/+4
2013-04-22remote-hg: use python urlparseFelipe Contreras1-4/+5
2013-04-22remote-hg: safer bookmark pushingFelipe Contreras1-0/+2
2013-04-22remote-helpers: avoid has_keyDusty Phillips2-2/+2
2013-04-22git add: rephrase -A/--no-all warningJunio C Hamano1-6/+6
2013-04-22git add: --ignore-removal is a better named --no-allJunio C Hamano2-4/+17
2013-04-22Sync with maintJunio C Hamano1-0/+25
2013-04-22Start preparing for 1.8.2.2Junio C Hamano2-1/+26
2013-04-22Merge branch 'ta/glossary' into maintJunio C Hamano32-111/+89
2013-04-22Merge branch 'jk/doc-http-backend' into maintJunio C Hamano3-1/+129
2013-04-22Merge branch 'jk/test-trash' into maintJunio C Hamano1-9/+9
2013-04-22Merge branch 'jk/daemon-user-doc' into maintJunio C Hamano1-0/+7
2013-04-22Merge branch 'jc/detached-head-doc' into maintJunio C Hamano1-3/+16
2013-04-22Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano1-9/+8
2013-04-22Merge branch 'js/rerere-forget-protect-against-NUL' into maintJunio C Hamano2-10/+36
2013-04-22Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano4-7/+41
2013-04-22Merge branch 'ap/combine-diff-ignore-whitespace' into maintJunio C Hamano2-7/+161
2013-04-22Merge branch 'jk/suppress-clang-warning' into maintJunio C Hamano2-2/+4
2013-04-22Merge branch 'tr/perl-keep-stderr-open' into maintJunio C Hamano2-4/+5
2013-04-22Merge branch 'lf/bundle-with-tip-wo-message' into maintJunio C Hamano2-1/+11
2013-04-22Merge branch 'jk/filter-branch-come-back-to-original' into maintJunio C Hamano2-2/+17
2013-04-22Merge branch 'rr/prompt-revert-head' into maintJunio C Hamano1-0/+2
2013-04-22Update draft release notes to 1.8.3Junio C Hamano1-0/+22
2013-04-22Merge branch 'as/clone-reference-with-gitfile'Junio C Hamano2-3/+26
2013-04-22Merge branch 'jc/add-2.0-delete-default' (early part)Junio C Hamano3-32/+103
2013-04-22Merge branch 'nd/checkout-keep-sparse'Junio C Hamano5-1/+40
2013-04-22Merge branch 'jk/chopped-ident'Junio C Hamano5-99/+75
2013-04-22Merge branch 'th/bisect-final-log'Junio C Hamano2-1/+25
2013-04-22Merge branch 'rs/archive-zip-raw-compression'Junio C Hamano1-2/+2
2013-04-22zlib: fix compilation failures with Sun C CompilaerStefano Lattarini1-2/+2
2013-04-22builtin/shortlog.c: make usage string consistent with logRamkumar Ramachandra1-3/+1
2013-04-22builtin/log.c: make usage string consistent with docRamkumar Ramachandra1-1/+1
2013-04-21git-shortlog.txt: make SYNOPSIS match log, update OPTIONSRamkumar Ramachandra1-2/+17
2013-04-21git-log.txt: rewrite note on why "--" may be requiredRamkumar Ramachandra1-2/+2
2013-04-21git-log.txt: generalize <since>..<until>Ramkumar Ramachandra1-7/+9
2013-04-21git-log.txt: order OPTIONS properly; move <since>..<until>Ramkumar Ramachandra1-7/+7
2013-04-21revisions.txt: clarify the .. and ... syntaxRamkumar Ramachandra1-2/+4
2013-04-21git add: rephrase the "removal will cease to be ignored" warningJunio C Hamano1-7/+14
2013-04-21glossary: a revision is just a commitJonathan Nieder1-3/+1