summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-05-16rev-list-options.txt: correct TREESAME for PLibravatar Kevin Bracey1-2/+1
2013-05-16t6111: add parents to testsLibravatar Kevin Bracey1-19/+19
2013-05-16t6111: allow checking the parents as wellLibravatar Junio C Hamano1-9/+21
2013-05-16t6111: new TREESAME test setLibravatar Kevin Bracey1-0/+184
2013-05-16t6019: test file dropped in -s ours mergeLibravatar Kevin Bracey1-0/+19
2013-05-16decorate.c: compact table when growingLibravatar Kevin Bracey1-1/+1
2013-05-16revision.c: treat A...B merge bases as if manually specifiedLibravatar Kevin Bracey3-1/+19
2013-05-13t6019: demonstrate --ancestry-path A...B breakageLibravatar Kevin Bracey1-1/+20
2013-05-11test-bzr: do not use unportable sed '\+'Libravatar Torsten Bögershausen1-1/+1
2013-05-11Merge git://git.bogomips.org/git-svnLibravatar Junio C Hamano9-7/+196
2013-05-09Sync with v1.8.2.3Libravatar Junio C Hamano5-8/+26
2013-05-09Git 1.8.2.3Libravatar Junio C Hamano4-3/+23
2013-05-09Merge branch 'mv/sequencer-pick-error-diag'Libravatar Junio C Hamano1-3/+3
2013-05-09cherry-pick: picking a tag that resolves to a commit is OKLibravatar Junio C Hamano1-3/+3
2013-05-09Merge branch 'tr/copy-revisions-from-stdin' into maintLibravatar Junio C Hamano1-1/+2
2013-05-09t5004: avoid using tar for checking emptiness of archiveLibravatar René Scharfe1-3/+2
2013-05-09t5004: ignore pax global header fileLibravatar René Scharfe1-1/+1
2013-05-09mergetools/kdiff3: do not use --auto when diffingLibravatar David Aguilar1-1/+1
2013-05-09transport-helper: trivial style cleanupLibravatar Felipe Contreras1-2/+1
2013-05-09git-svn: added an --include-path flagLibravatar Paul Walmsley5-3/+180
2013-05-09Git::SVN::*: add missing "NAME" section to perldocLibravatar Jonathan Nieder4-0/+8
2013-05-09git-svn: avoid self-referencing mergeinfoLibravatar Michael Contreras2-4/+8
2013-05-07Update draft release notes for 1.8.3Libravatar Junio C Hamano1-2/+3
2013-05-07remote-helpers: trivial cleanupLibravatar Felipe Contreras1-1/+0
2013-05-07remote-bzr: fix for disappeared revisionsLibravatar Felipe Contreras2-4/+49
2013-05-07Merge git://github.com/git-l10n/git-poLibravatar Junio C Hamano5-2669/+3650
2013-05-08l10n: zh_CN.po: translate 44 messages (2080t0f0u)Libravatar Jiang Xin1-530/+728
2013-05-07l10n: de.po: translate 44 new messagesLibravatar Ralf Thielow1-554/+774
2013-05-06Merge branch 'jk/merge-tree-added-identically'Libravatar Junio C Hamano2-1/+56
2013-05-06merge-tree: handle directory/empty conflict correctlyLibravatar John Keeping2-1/+56
2013-05-06Merge branch 'fc/remote-bzr'Libravatar Junio C Hamano2-81/+298
2013-05-06remote-bzr: avoid bad refsLibravatar Felipe Contreras1-15/+23
2013-05-06remote-bzr: convert all unicode keys to strLibravatar Felipe Contreras1-2/+2
2013-05-05Merge branch 'fc/push-with-export-reporting-result'Libravatar Junio C Hamano2-0/+15
2013-05-05transport-helper: improve push messagesLibravatar Felipe Contreras2-0/+15
2013-05-03Git 1.8.3-rc1Libravatar Junio C Hamano1-1/+1
2013-05-03Merge branch 'tr/unpack-entry-use-after-free-fix'Libravatar Junio C Hamano1-1/+0
2013-05-03Sync with maintLibravatar Junio C Hamano2-3/+3
2013-05-03Merge branch 'tr/remote-tighten-commandline-parsing' into maintLibravatar Junio C Hamano3-3/+25
2013-05-03Merge branch 'jn/glossary-revision' into maintLibravatar Junio C Hamano1-3/+1
2013-05-03completion: zsh: don't override suffix on _detaultLibravatar Felipe Contreras1-1/+1
2013-05-02Documentation/git-commit: Typo under --editLibravatar Anders Granskogen Bjørnstad1-2/+2
2013-05-01Update draft release notes to 1.8.3Libravatar Junio C Hamano1-3/+16
2013-05-01Fix grammar in the 1.8.3 release notes.Libravatar Marc Branchaud1-78/+77
2013-05-01Merge branch 'hb/git-pm-tempfile'Libravatar Junio C Hamano1-1/+1
2013-05-01Merge branch 'rs/pp-user-info-without-extra-allocation'Libravatar Junio C Hamano1-35/+14
2013-05-01Merge branch 'tr/remote-tighten-commandline-parsing'Libravatar Junio C Hamano3-3/+25
2013-05-01Merge branch 'zk/prompt-rebase-step'Libravatar Junio C Hamano3-9/+31
2013-05-01Merge remote-tracking branch 'vi-vnwildman/master'Libravatar Jiang Xin1-543/+747
2013-05-01l10n: Update Vietnamese translation (2080t0f0u)Libravatar Tran Ngoc Quan1-543/+747