summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-prompt.sh: document GIT_PS1_STATESEPARATORjc/prompt-document-ps1-state-separatorJoe Cridge2015-06-101-0/+4
* prompt: introduce GIT_PS1_STATESEPARATORRamkumar Ramachandra2013-05-171-3/+4
* Revert "remote-hg: update bookmarks when pulling"Felipe Contreras2013-05-161-3/+0
* git-submodule.txt: Clarify 'init' and 'add' subcommands.Dale R. Worley2013-05-161-2/+6
* remote-bzr: fix cloning of non-listable reposFelipe Contreras2013-05-161-0/+3
* Merge branch 'fc/remote-hg' (early part)Junio C Hamano2013-05-152-24/+22
|\
| * remote-hg: update bookmarks when pullingFelipe Contreras2013-05-151-0/+3
| * remote-hg: don't push fake 'master' bookmarkFelipe Contreras2013-05-151-1/+2
| * remote-hg: disable forced push by defaultFelipe Contreras2013-05-151-1/+1
| * remote-hg: fix new branch creationFelipe Contreras2013-05-151-1/+1
| * remote-hg: add new get_config_bool() helperFelipe Contreras2013-05-151-11/+13
| * remote-hg: enable track-branches in hg-git modeFelipe Contreras2013-05-152-1/+1
| * remote-hg: get rid of unused exception checksFelipe Contreras2013-05-151-15/+9
| * remote-hg: trivial cleanupsFelipe Contreras2013-05-152-3/+1
* | remote-bzr: update old organizationFelipe Contreras2013-05-141-0/+7
* | Git 1.8.3-rc2v1.8.3-rc2Junio C Hamano2013-05-132-4/+9
* | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-05-131-55/+199
|\ \
| * | gitk: On OSX, bring the gitk window to frontTair Sabirgaliev2013-05-131-0/+9
| * | gitk: Add support for -G'regex' pickaxe variantMartin Langhoff2013-05-131-1/+4
| * | gitk: Add menu item for reverting commitsKnut Franke2013-05-111-0/+62
| * | gitk: Simplify file filteringFelipe Contreras2013-05-111-13/+7
| * | gitk: Display the date of a tag in a human-friendly wayAnand Kumria2013-05-111-1/+1
| * | gitk: Improve behaviour of drop-down listsPaul Mackerras2013-05-111-1/+6
| * | gitk: Move hard-coded colors to .gitkGauthier Östervall2013-04-011-39/+110
* | | test-bzr: do not use unportable sed '\+'Torsten Bögershausen2013-05-111-1/+1
* | | Merge git://git.bogomips.org/git-svnJunio C Hamano2013-05-119-7/+196
|\ \ \ | |_|/ |/| |
| * | git-svn: added an --include-path flagPaul Walmsley2013-05-095-3/+180
| * | Git::SVN::*: add missing "NAME" section to perldocJonathan Nieder2013-05-094-0/+8
| * | git-svn: avoid self-referencing mergeinfoMichael Contreras2013-05-092-4/+8
* | | Sync with v1.8.2.3Junio C Hamano2013-05-095-8/+26
|\ \ \
| * | | Git 1.8.2.3v1.8.2.3Junio C Hamano2013-05-094-3/+23
| * | | Merge branch 'tr/copy-revisions-from-stdin' into maintJunio C Hamano2013-05-091-1/+2
| |\ \ \
| * | | | t5004: avoid using tar for checking emptiness of archiveRené Scharfe2013-05-091-3/+2
| * | | | t5004: ignore pax global header fileRené Scharfe2013-05-091-1/+1
| * | | | mergetools/kdiff3: do not use --auto when diffingDavid Aguilar2013-05-091-1/+1
| * | | | transport-helper: trivial style cleanupFelipe Contreras2013-05-091-2/+1
* | | | | Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano2013-05-091-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | cherry-pick: picking a tag that resolves to a commit is OKJunio C Hamano2013-05-091-3/+3
* | | | | Update draft release notes for 1.8.3Junio C Hamano2013-05-071-2/+3
* | | | | remote-helpers: trivial cleanupFelipe Contreras2013-05-071-1/+0
* | | | | remote-bzr: fix for disappeared revisionsFelipe Contreras2013-05-072-4/+49
* | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-05-075-2669/+3650
|\ \ \ \ \
| * | | | | l10n: zh_CN.po: translate 44 messages (2080t0f0u)Jiang Xin2013-05-081-530/+728
| * | | | | l10n: de.po: translate 44 new messagesRalf Thielow2013-05-071-554/+774
| * | | | | Merge remote-tracking branch 'vi-vnwildman/master'Jiang Xin2013-05-011-543/+747
| |\ \ \ \ \
| | * | | | | l10n: Update Vietnamese translation (2080t0f0u)Tran Ngoc Quan2013-05-011-543/+747
| * | | | | | l10n: Update Swedish translation (2080t0f0u)Peter Krefting2013-04-301-537/+731
| |/ / / / /
| * | | | | l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)Jiang Xin2013-04-301-505/+670
* | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-05-062-1/+56
|\ \ \ \ \ \
| * | | | | | merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-062-1/+56