summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-05-17Merge git://ozlabs.org/~paulus/gitkLibravatar Junio C Hamano1-295/+338
2013-05-17difftool: fix dir-diff when file does not exist in working treeLibravatar John Keeping2-0/+13
2013-05-17remote-bzr: fixes for older versions of bzrLibravatar Felipe Contreras1-2/+4
2013-05-17remote-bzr: fix old organization destroyLibravatar Sandor Bodo-Merle1-0/+2
2013-05-17prompt: colorize ZSH promptLibravatar Ramkumar Ramachandra1-1/+39
2013-05-17prompt: factor out gitstring coloring logicLibravatar Ramkumar Ramachandra1-36/+43
2013-05-17prompt: introduce GIT_PS1_STATESEPARATORLibravatar Ramkumar Ramachandra1-3/+4
2013-05-17git-gui: change dialog button positions for Windows to suit platform.Libravatar Pat Thoyts1-1/+3
2013-05-16Documentation/merge-options.txt: restore `-e` optionLibravatar Richard Hansen1-1/+2
2013-05-17gitk: Update Swedish translation (304t)Libravatar Peter Krefting1-295/+338
2013-05-16Revert "remote-hg: update bookmarks when pulling"Libravatar Felipe Contreras1-3/+0
2013-05-16git-gui: allow "\ No newline at end of file" for linewise stagingLibravatar Heiko Voigt1-2/+9
2013-05-16strbuf_branchname(): do not double-expand @{-1}~22Libravatar Junio C Hamano2-4/+19
2013-05-16git-submodule.txt: Clarify 'init' and 'add' subcommands.Libravatar Dale R. Worley1-2/+6
2013-05-16revision.c: make default history consider bottom commitsLibravatar Kevin Bracey2-7/+7
2013-05-16revision.c: don't show all merges for --parentsLibravatar Kevin Bracey2-9/+17
2013-05-16revision.c: discount side branches when computing TREESAMELibravatar Kevin Bracey3-27/+164
2013-05-16revision.c: add BOTTOM flag for commitsLibravatar Kevin Bracey2-19/+18
2013-05-16simplify-merges: drop merge from irrelevant side branchLibravatar Kevin Bracey3-15/+47
2013-05-16simplify-merges: never remove all TREESAME parentsLibravatar Kevin Bracey3-3/+73
2013-05-16t6012: update test for tweaked full-history traversalLibravatar Junio C Hamano1-6/+23
2013-05-16revision.c: Make --full-history consider more mergesLibravatar Kevin Bracey5-47/+229
2013-05-16Documentation: avoid "uninteresting"Libravatar Kevin Bracey1-2/+2
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-16remote-bzr: fix cloning of non-listable reposLibravatar Felipe Contreras1-0/+3
2013-05-15Merge branch 'fc/remote-hg' (early part)Libravatar Junio C Hamano2-24/+22
2013-05-15remote-hg: update bookmarks when pullingLibravatar Felipe Contreras1-0/+3
2013-05-15remote-hg: don't push fake 'master' bookmarkLibravatar Felipe Contreras1-1/+2
2013-05-15remote-hg: disable forced push by defaultLibravatar Felipe Contreras1-1/+1
2013-05-15remote-hg: fix new branch creationLibravatar Felipe Contreras1-1/+1
2013-05-15remote-hg: add new get_config_bool() helperLibravatar Felipe Contreras1-11/+13
2013-05-15remote-hg: enable track-branches in hg-git modeLibravatar Felipe Contreras2-1/+1
2013-05-15remote-hg: get rid of unused exception checksLibravatar Felipe Contreras1-15/+9
2013-05-15remote-hg: trivial cleanupsLibravatar Felipe Contreras2-3/+1
2013-05-15combine-diff.c: Fix output when changes are exactly 3 lines apartLibravatar Matthijs Kooijman2-2/+53
2013-05-14remote-bzr: update old organizationLibravatar Felipe Contreras1-0/+7
2013-05-13coverage: build coverage-untested-functions by defaultLibravatar Thomas Rast1-1/+1
2013-05-13coverage: set DEFAULT_TEST_TARGET to avoid using proveLibravatar Thomas Rast1-1/+1
2013-05-13coverage: do not delete .gcno files before buildingLibravatar Thomas Rast1-3/+6
2013-05-13coverage: split build target into compile and testLibravatar Thomas Rast1-3/+5
2013-05-13Git 1.8.3-rc2Libravatar Junio C Hamano2-4/+9
2013-05-13t6019: demonstrate --ancestry-path A...B breakageLibravatar Kevin Bracey1-1/+20
2013-05-13Merge git://ozlabs.org/~paulus/gitkLibravatar Junio C Hamano1-55/+199
2013-05-13gitk: On OSX, bring the gitk window to frontLibravatar Tair Sabirgaliev1-0/+9