summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-06-28Git 1.8.3.2v1.8.3.2Junio C Hamano3-2/+8
2013-06-28configure: fix option help message for --disable-pthreadsStefano Lattarini1-1/+1
2013-06-28Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano6-38/+97
2013-06-27Start preparing for 1.8.3.2Junio C Hamano2-1/+55
2013-06-27Merge branch 'ks/difftool-dir-diff-copy-fix' into maintJunio C Hamano2-7/+21
2013-06-27Merge branch 'rr/push-head' into maintJunio C Hamano1-7/+14
2013-06-27Merge branch 'fc/show-branch-in-rebase-am' into maintJunio C Hamano2-1/+3
2013-06-27Merge branch 'tg/maint-zsh-svn-remote-prompt' into maintJunio C Hamano1-3/+4
2013-06-27Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maintJunio C Hamano1-1/+1
2013-06-27Merge branch 'tr/push-no-verify-doc' into maintJunio C Hamano1-1/+6
2013-06-27Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2-4/+23
2013-06-27Merge branch 'jc/strbuf-branchname-fix' into maintJunio C Hamano2-4/+19
2013-06-27Merge branch 'mk/combine-diff-context-horizon-fix' into maintJunio C Hamano2-2/+53
2013-06-27Merge branch 'kb/ancestry-path-threedots' into maintJunio C Hamano3-1/+38
2013-06-27Merge branch 'jk/subtree-do-not-push-if-split-fails' into maintJunio C Hamano1-1/+2
2013-06-27Merge branch 'mh/fetch-into-shallow' into maintJunio C Hamano3-3/+16
2013-06-27Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano8-35/+221
2013-06-21completion: complete diff --word-diffRamkumar Ramachandra1-1/+1
2013-06-11Merge branch 'maint-1.8.2' into maintJunio C Hamano2-1/+1
2013-06-11t0070 "mktemp to unwritable directory" needs SANITYTorsten Bögershausen1-1/+1
2013-06-11pre-push.sample: Make the script executableWieland Hoffmann1-0/+0
2013-06-10Git 1.8.3.1v1.8.3.1Junio C Hamano4-2/+22
2013-06-10mingw: make mingw_signal return the correct handlerErik Faye-Lund1-1/+3
2013-06-09Merge branch 'jn/config-ignore-inaccessible' into maintJunio C Hamano5-15/+22
2013-06-09Merge branch 'kb/status-ignored-optim-2' into maintJunio C Hamano2-0/+21
2013-06-09submodule: remove redundant check for the_index.initializedRené Scharfe1-3/+2
2013-06-09Document .git/modulesFredrik Gustafsson1-0/+3
2013-06-04t/README: test_must_fail is for testing GitJunio C Hamano1-0/+3
2013-06-03sha1_file: trivial style cleanupFelipe Contreras1-1/+1
2013-06-02dir.c: fix ignore processing within not-ignored directoriesKarsten Blees2-0/+21
2013-05-29push: make push.default = current use resolved HEADRamkumar Ramachandra1-1/+1
2013-05-29push: fail early with detached HEAD and currentRamkumar Ramachandra1-0/+5
2013-05-29Start 1.8.3.1 maintenance trackJunio C Hamano1-1/+1
2013-05-29Merge branch 'maint-1.8.2' into maintJunio C Hamano1-1/+1
2013-05-29difftool --dir-diff: allow changing any clean working tree fileKenichi Saita2-7/+21
2013-05-29push: factor out the detached HEAD error messageRamkumar Ramachandra1-6/+8
2013-05-29prompt: fix for simple rebaseFelipe Contreras2-1/+3
2013-05-28trivial: Add missing period in documentationPhil Hord1-1/+1
2013-05-28commit: don't start editor if empty message is given with -mRené Scharfe2-4/+23
2013-05-28fetch-pack: prepare updated shallow file before fetching the packNguyễn Thái Ngọc Duy5-38/+93
2013-05-24Git 1.8.3v1.8.3Junio C Hamano1-11/+11
2013-05-24urls.txt: avoid auto converting to hyperlinkNguyễn Thái Ngọc Duy1-1/+1
2013-05-23Document push --no-verifyThomas Rast1-1/+6
2013-05-22prompt: fix show upstream with svn and zshThomas Gummerer1-3/+4
2013-05-21remote-hg: fix order of configuration commentsFelipe Contreras1-3/+3
2013-05-21remote-hg: trivial configuration note cleanupFelipe Contreras1-1/+1
2013-05-21completion: regression fix for zshFelipe Contreras1-1/+1
2013-05-20Merge git://git.bogomips.org/git-svnJunio C Hamano3-6/+97
2013-05-20git-svn: introduce --parents parameter for commands branch and tagTobias Schulte3-1/+71
2013-05-20git-svn: clarify explanation of --destination argumentJonathan Nieder1-5/+14
2013-05-20git-svn: multiple fetch/branches/tags keys are supportedNathan Gray1-0/+12
2013-05-20remote-hg: set stdout to binary mode on win32Amit Bakshi1-0/+4
2013-05-17Git 1.8.3-rc3v1.8.3-rc3Junio C Hamano1-1/+1
2013-05-17Merge branch 'fc/doc-style'Junio C Hamano20-47/+37
2013-05-17Merge branch 'dw/asciidoc-sources-are-dot-txt-files'Junio C Hamano1-2/+4
2013-05-17documentation: trivial style cleanupsFelipe Contreras20-47/+37
2013-05-17Merge git://ozlabs.org/~paulus/gitkJunio C Hamano1-295/+338
2013-05-17difftool: fix dir-diff when file does not exist in working treeJohn Keeping2-0/+13
2013-05-17remote-bzr: fixes for older versions of bzrFelipe Contreras1-2/+4
2013-05-17remote-bzr: fix old organization destroySandor Bodo-Merle1-0/+2
2013-05-17gitk: Update Swedish translation (304t)Peter Krefting1-295/+338
2013-05-16Revert "remote-hg: update bookmarks when pulling"Felipe Contreras1-3/+0
2013-05-16strbuf_branchname(): do not double-expand @{-1}~22Junio C Hamano2-4/+19
2013-05-16git-submodule.txt: Clarify 'init' and 'add' subcommands.Dale R. Worley1-2/+6
2013-05-16revision.c: treat A...B merge bases as if manually specifiedKevin Bracey3-1/+19
2013-05-16remote-bzr: fix cloning of non-listable reposFelipe Contreras1-0/+3
2013-05-15Merge branch 'fc/remote-hg' (early part)Junio C Hamano2-24/+22
2013-05-15remote-hg: update bookmarks when pullingFelipe Contreras1-0/+3
2013-05-15remote-hg: don't push fake 'master' bookmarkFelipe Contreras1-1/+2
2013-05-15remote-hg: disable forced push by defaultFelipe Contreras1-1/+1
2013-05-15remote-hg: fix new branch creationFelipe Contreras1-1/+1
2013-05-15remote-hg: add new get_config_bool() helperFelipe Contreras1-11/+13
2013-05-15remote-hg: enable track-branches in hg-git modeFelipe Contreras2-1/+1
2013-05-15remote-hg: get rid of unused exception checksFelipe Contreras1-15/+9
2013-05-15remote-hg: trivial cleanupsFelipe Contreras2-3/+1
2013-05-15combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman2-2/+53
2013-05-14remote-bzr: update old organizationFelipe Contreras1-0/+7
2013-05-13Git 1.8.3-rc2v1.8.3-rc2Junio C Hamano2-4/+9
2013-05-13t6019: demonstrate --ancestry-path A...B breakageKevin Bracey1-1/+20
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-11clone: let the user know when check_everything_connected is runNguyễn Thái Ngọc Duy1-0/+4
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-10CodingGuidelines: Documentation/*.txt are the sourcesDale Worley1-2/+4
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-02t5500: add test for fetching with an unknown 'shallow'Michael Heemskerk1-0/+14
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-01contrib/subtree: don't delete remote branches if split failsJohn Keeping1-1/+2
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-28upload-pack: ignore 'shallow' lines with unknown obj-idsMichael Heemskerk2-3/+2
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