summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-01-31Merge branch 'ld/git-p4-branches-and-labels'Libravatar Junio C Hamano3-35/+205
2012-01-31Merge branch 'rr/sequencer'Libravatar Junio C Hamano3-947/+960
2012-01-31Merge branch 'jc/advise-i18n'Libravatar Junio C Hamano2-12/+20
2012-01-31request-pull: explicitly ask tags/$name to be pulledLibravatar Junio C Hamano3-8/+4
2012-01-31merge: add instructions to the commit message when editingLibravatar Thomas Rast1-0/+10
2012-01-30completion: --edit and --no-edit for git-mergeLibravatar Adrian Weimann1-1/+1
2012-01-29Kick off the post 1.7.9 cycleLibravatar Junio C Hamano3-2/+71
2012-01-29completion: --edit-description option for git-branchLibravatar Ralf Thielow1-1/+1
2012-01-29Merge branch 'nd/index-pack-no-recurse'Libravatar Junio C Hamano3-68/+154
2012-01-29Merge branch 'rs/diff-postimage-in-context'Libravatar Junio C Hamano2-13/+13
2012-01-29Merge branch 'jk/parse-object-cached'Libravatar Junio C Hamano4-6/+27
2012-01-29Merge branch 'sp/smart-http-failure-to-push'Libravatar Junio C Hamano2-4/+33
2012-01-29Merge branch 'jc/maint-log-first-parent-pathspec'Libravatar Junio C Hamano2-1/+10
2012-01-29Merge branch 'mh/ref-clone-without-extra-refs'Libravatar Junio C Hamano4-11/+40
2012-01-29Merge branch 'jl/test-pause'Libravatar Junio C Hamano2-0/+26
2012-01-29Merge branch 'tr/maint-mailinfo'Libravatar Junio C Hamano4-7/+41
2012-01-29Merge branch 'pw/p4-view-updates'Libravatar Junio C Hamano4-7/+406
2012-01-29Merge branch 'nd/maint-refname-in-hierarchy-check'Libravatar Junio C Hamano3-4/+4
2012-01-29Merge branch 'jn/gitweb-unspecified-action'Libravatar Junio C Hamano2-1/+11
2012-01-29Merge branch 'cb/push-quiet'Libravatar Junio C Hamano8-19/+78
2012-01-29Merge branch 'nd/clone-single-branch'Libravatar Junio C Hamano3-6/+129
2012-01-29Merge branch 'cb/git-daemon-tests'Libravatar Junio C Hamano3-3/+220
2012-01-29Merge branch 'cb/maint-kill-subprocess-upon-signal'Libravatar Junio C Hamano3-1/+72
2012-01-27vcs-svn/svndiff.c: squelch false "unused" warning from gccLibravatar Junio C Hamano1-1/+1
2012-01-27Git 1.7.9Libravatar Junio C Hamano2-1/+6
2012-01-27Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-feLibravatar Junio C Hamano28-1362/+1432
2012-01-27i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXTLibravatar Junio C Hamano1-1/+1
2012-01-26INSTALL: warn about recent Fedora breakageLibravatar Junio C Hamano1-1/+5
2012-01-26git-completion: workaround zsh COMPREPLY bugLibravatar Felipe Contreras1-0/+8
2012-01-26t9801: do not overuse test_must_failLibravatar Junio C Hamano1-4/+4
2012-01-26git-p4: Change p4 command invocationLibravatar Pete Wyckoff1-1/+1
2012-01-26git-p4: Add test case for complex branch importLibravatar Vitor Antunes1-7/+87
2012-01-26git-p4: Search for parent commit on branch creationLibravatar Vitor Antunes1-1/+45
2012-01-26docs: minor grammar fixes for v1.7.9 release notesLibravatar Jeff King1-6/+7
2012-01-24submodule add: fix breakage when re-adding a deep submoduleLibravatar Jens Lehmann2-0/+9
2012-01-24clone: fix up delay cloning conditionsLibravatar Nguyễn Thái Ngọc Duy3-12/+15
2012-01-23push: do not let configured foreign-vcs permanently clobberedLibravatar Junio C Hamano1-0/+2
2012-01-23merge: use editor by default in interactive sessionsLibravatar Junio C Hamano4-9/+50
2012-01-23i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10nLibravatar Junio C Hamano1-0/+1
2012-01-23add a Makefile switch to avoid gettext translation in shell scriptsLibravatar Alex Riesen2-2/+9
2012-01-23git-sh-i18n: restructure the logic to compute gettext.sh schemeLibravatar Junio C Hamano1-53/+50
2012-01-23mergetool: Provide an empty file when neededLibravatar David Aguilar2-5/+35
2012-01-23grep: fix -l/-L interaction with decoration linesLibravatar Albert Yale2-2/+25
2012-01-23Fix typo in 1.7.9 release notesLibravatar Michael Haggerty1-1/+1
2012-01-22t/Makefile: Use $(sort ...) explicitly where neededLibravatar Kirill Smelkov1-3/+3
2012-01-20git-p4: label import fails with multiple labels at the same changelistLibravatar Luke Diamand1-0/+41
2012-01-20git-p4: add test for p4 labelsLibravatar Luke Diamand1-0/+72
2012-01-20git-p4: importing labels should cope with missing ownerLibravatar Luke Diamand1-28/+35
2012-01-20git-p4: cope with labels with empty descriptionsLibravatar Luke Diamand1-3/+5
2012-01-20git-p4: handle p4 branches and labels containing shell charsLibravatar Luke Diamand2-4/+52