summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
* | | | | | | Merge branch 'fc/remote-bzr'Junio C Hamano2013-05-062-81/+298
|\ \ \ \ \ \ \
| * | | | | | | remote-bzr: avoid bad refsFelipe Contreras2013-05-061-15/+23
| * | | | | | | remote-bzr: convert all unicode keys to strFelipe Contreras2013-05-061-2/+2
| * | | | | | | remote-bzr: access branches only when neededFelipe Contreras2013-04-301-12/+16
| * | | | | | | remote-bzr: delay peer branch usageFelipe Contreras2013-04-301-3/+3
| * | | | | | | remote-bzr: iterate revisions properlyFelipe Contreras2013-04-301-2/+3
| * | | | | | | remote-bzr: improve progress reportingFelipe Contreras2013-04-301-7/+13
| * | | | | | | remote-bzr: add option to specify branchesFelipe Contreras2013-04-301-2/+18
| * | | | | | | remote-bzr: add custom method to find branchesFelipe Contreras2013-04-301-5/+20
| * | | | | | | remote-bzr: improve author sanitazionFelipe Contreras2013-04-301-2/+13
| * | | | | | | remote-bzr: add support for shared repoFelipe Contreras2013-04-301-7/+15
| * | | | | | | remote-bzr: fix branch namesFelipe Contreras2013-04-301-0/+1
| * | | | | | | remote-bzr: add support for bzr reposFelipe Contreras2013-04-302-56/+138
| * | | | | | | remote-bzr: use branch variable when appropriateFelipe Contreras2013-04-301-17/+18
| * | | | | | | remote-bzr: fix partially pushed mergeFelipe Contreras2013-04-301-4/+13
| * | | | | | | remote-bzr: fixes for branch divergeFelipe Contreras2013-04-301-1/+7
| * | | | | | | remote-bzr: add support to push mergesFelipe Contreras2013-04-302-8/+57
| * | | | | | | remote-bzr: always try to update the worktreeFelipe Contreras2013-04-301-1/+5
| * | | | | | | remote-bzr: fix order of locking in CustomTreeFelipe Contreras2013-04-301-1/+1
| * | | | | | | remote-bzr: delay blob fetching until the very endFelipe Contreras2013-04-301-3/+5
| * | | | | | | remote-bzr: cleanup CustomTreeFelipe Contreras2013-04-301-7/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fc/push-with-export-reporting-result'Junio C Hamano2013-05-052-0/+15
|\ \ \ \ \ \ \
| * | | | | | | transport-helper: improve push messagesFelipe Contreras2013-05-052-0/+15
| | |_|_|/ / / | |/| | | | |
* | | | | | | Git 1.8.3-rc1v1.8.3-rc1Junio C Hamano2013-05-031-1/+1
* | | | | | | Merge branch 'tr/unpack-entry-use-after-free-fix'Junio C Hamano2013-05-031-1/+0
|\ \ \ \ \ \ \
| * | | | | | | unpack_entry: avoid freeing objects in base cacheThomas Rast2013-04-301-1/+0
* | | | | | | | Sync with maintJunio C Hamano2013-05-032-3/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-033-3/+25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/glossary-revision' into maintJunio C Hamano2013-05-031-3/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | completion: zsh: don't override suffix on _detaultFelipe Contreras2013-05-031-1/+1
| * | | | | | | | | Documentation/git-commit: Typo under --editAnders Granskogen Bjørnstad2013-05-021-2/+2
* | | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-05-011-3/+16
* | | | | | | | | | Fix grammar in the 1.8.3 release notes.Marc Branchaud2013-05-011-78/+77
* | | | | | | | | | Merge branch 'hb/git-pm-tempfile'Junio C Hamano2013-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git.pm: call tempfile from File::Temp as a regular functionH. Merijn Brand2013-04-291-1/+1
* | | | | | | | | | | Merge branch 'rs/pp-user-info-without-extra-allocation'Junio C Hamano2013-05-011-35/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pretty: remove intermediate strbufs from pp_user_info()René Scharfe2013-04-251-20/+9
| * | | | | | | | | | | pretty: simplify output line length calculation in pp_user_info()René Scharfe2013-04-251-4/+3
| * | | | | | | | | | | pretty: simplify input line length calculation in pp_user_info()René Scharfe2013-04-251-11/+2
* | | | | | | | | | | | Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano2013-05-013-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | remote: 'show' and 'prune' can take more than one remoteThomas Rast2013-04-242-10/+5
| * | | | | | | | | | | remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-242-2/+2
| * | | | | | | | | | | remote: add a test for extra arguments, according to docsThomas Rast2013-04-241-0/+27
* | | | | | | | | | | | Merge branch 'zk/prompt-rebase-step'Junio C Hamano2013-05-013-9/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |