summaryrefslogtreecommitdiffstats
path: root/ll-merge.h (unfollow)
Commit message (Expand)AuthorFilesLines
2012-09-11Almost 1.7.11.6Junio C Hamano1-1/+29
2012-08-24Prepare for 1.7.11.6Junio C Hamano2-1/+35
2012-08-24Make the ciabot scripts completely self-configuring in the normal case.Eric S. Raymond4-37/+72
2012-08-24Improved documentation for the ciabot scripts.Eric S. Raymond2-2/+50
2012-08-22contrib/ciabot: Get ciabot configuration from git variablesEric S. Raymond2-118/+156
2012-08-20Git 1.7.12v1.7.12Junio C Hamano2-1/+6
2012-08-17Documentation: update URL for formatted pagesJunio C Hamano1-1/+1
2012-08-17man: git pull -r is a short for --rebaseMiklos Vajna1-0/+1
2012-08-17gitcli: describe abbreviation of long optionsJunio C Hamano1-0/+8
2012-08-16l10n: Fixes to Swedish translationPeter Krefting1-6/+6
2012-08-15Git 1.7.12-rc3v1.7.12-rc3Junio C Hamano2-11/+2
2012-08-15Git 1.7.11.5v1.7.11.5Junio C Hamano3-2/+11
2012-08-15rev-list docs: clarify --topo-order descriptionJunio C Hamano1-7/+24
2012-08-15gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFOJay Soffian1-0/+5
2012-08-15Documentation/CodingGuidelines: spell out more shell guidelinesHeiko Voigt1-0/+8
2012-08-10git svn: reset invalidates the memoized mergeinfo cachesPeter Baumann2-2/+103
2012-08-10git svn: handle errors and concurrent commits in dcommitRobert Luberda2-19/+271
2012-08-10rebase -i: use full onto sha1 in reflogMichael J Gruber1-2/+1
2012-08-09l10n: Update Swedish translation (1168t0f0u)Peter Krefting1-510/+903
2012-08-08sh-setup: protect from exported IFSJunio C Hamano1-0/+4
2012-08-08Documentation: list git-credential in plumbing commandsMatthieu Moy2-1/+2
2012-08-08prune.c: only print informational message in show_only or verbose modeBrandon Casey1-1/+2
2012-08-07Git 1.7.12-rc2v1.7.12-rc2Junio C Hamano2-5/+1
2012-08-07l10n: de.po: translate 77 new messagesRalf Thielow1-46/+442
2012-08-07receive-pack: do not leak output from auto-gc to standard outputJunio C Hamano2-2/+3
2012-08-07t/t5400: demonstrate breakage caused by informational message from pruneBrandon Casey1-0/+35
2012-08-07Enable HAVE_DEV_TTY for SolarisBen Walton1-0/+1
2012-08-07terminal: seek when switching between reading and writingJeff King1-0/+1
2012-08-07l10n: vi.po: update one messageTran Ngoc Quan1-9/+11
2012-08-07Drop 1.7.11.x items from 1.7.12 release notesJunio C Hamano1-13/+0
2012-08-07Prepare for 1.7.11.5Junio C Hamano2-1/+29
2012-08-07doc: A few minor copy edits.Štěpán Němec5-10/+10
2012-08-06Makefile: use overridable $(FIND) instead of hard-coded 'find'Johannes Sixt1-1/+1
2012-08-06Documentation: do not mention .git/refs/* directoriesJunio C Hamano7-16/+27
2012-08-06l10n: zh_CN.po: update one translationJiang Xin1-8/+10
2012-08-06l10n: Update one message in git.potJiang Xin1-7/+9
2012-08-05merge-recursive: separate message for common ancestorsRalf Thielow1-1/+4
2012-08-05l10n: zh_CN.po: translate 76 new messagesJiang Xin1-366/+451
2012-08-05tests: Introduce test_seqMichał Kiedrowicz3-2/+23
2012-08-03git-remote-mediawiki: replace TODO-list in comment by appropriate linkMatthieu Moy1-14/+1
2012-08-03setup: clarify error messages for file/revisions ambiguityMatthieu Moy1-3/+5
2012-08-03l10n: vi.po update to follow POT in 3b613Tran Ngoc Quan1-44/+420
2012-08-02l10n: Update git.pot (76 new, 4 removed messages)Jiang Xin1-39/+394
2012-08-01git-rebase.sh: fix typo in an error messageRalf Thielow1-1/+1
2012-08-01send-email: improve RFC2047 quote parsingThomas Rast2-4/+19
2012-07-31l10n: de.po: translate 4 new messagesRalf Thielow1-494/+506
2012-07-31l10n: vi.po: translate 4 new messagesTran Ngoc Quan1-529/+545
2012-07-31l10n: zh_CN.po: translate 4 new messagesJiang Xin1-483/+776
2012-07-30Git 1.7.12-rc1v1.7.12-rc1Junio C Hamano2-33/+11
2012-07-30Git 1.7.11.4v1.7.11.4Junio C Hamano4-3/+35