summaryrefslogtreecommitdiffstats
path: root/merge-file.c (unfollow)
Commit message (Expand)AuthorFilesLines
2012-09-16wt-status.c: mark a private file-scope symbol as staticJunio C Hamano2-4/+2
2012-09-16read-cache.c: mark a private file-scope symbol as staticJunio C Hamano2-2/+1
2012-09-16strbuf.c: mark a private file-scope symbol as staticJunio C Hamano2-15/+2
2012-09-16sha1-array.c: mark a private file-scope symbol as staticJunio C Hamano3-5/+1
2012-09-16symlinks.c: mark private file-scope symbols as staticJunio C Hamano2-4/+5
2012-09-16notes.c: mark a private file-scope symbol as staticJunio C Hamano2-16/+12
2012-09-16rerere.c: mark private file-scope symbols as staticJunio C Hamano2-2/+1
2012-09-16graph.c: mark private file-scope symbols as staticJunio C Hamano2-29/+30
2012-09-16diff.c: mark a private file-scope symbol as staticJunio C Hamano2-2/+1
2012-09-16commit.c: mark a file-scope private symbol as staticJunio C Hamano2-3/+5
2012-09-16builtin/notes.c: mark file-scope private symbols as staticJunio C Hamano2-4/+5
2012-09-15Draft release notes to 1.8.0Junio C Hamano1-0/+7
2012-09-15Draft release notes to 1.7.12.1Junio C Hamano1-47/+69
2012-09-15Git 1.7.11.7v1.7.11.7Junio C Hamano4-3/+50
2012-09-14The sixth batch for 1.8.0Junio C Hamano1-0/+13
2012-09-13l10n: Update Swedish translation (1166t0f0u)Peter Krefting1-342/+373
2012-09-12Start merging the sixth batch for 1.8.0Junio C Hamano1-33/+18
2012-09-12Further merging in preparation for 1.7.12.1Junio C Hamano1-0/+26
2012-09-12ll-merge: warn about inability to merge binary files only when we can'tJunio C Hamano1-3/+4
2012-09-11checkout: reorder option handlingNguyễn Thái Ngọc Duy1-77/+112
2012-09-11Second half of the fifth batch for 1.8.0Junio C Hamano1-45/+17
2012-09-11Further merging down for 1.7.12.1Junio C Hamano1-0/+13
2012-09-11Git 1.7.11.6v1.7.11.6Junio C Hamano3-35/+58
2012-09-11run-command.c: fix broken list iteration in clear_child_for_cleanupDavid Gould1-6/+7
2012-09-11build: don't duplicate substitution of make variablesStefano Lattarini2-117/+76
2012-09-11build: improve GIT_CONF_SUBST signatureStefano Lattarini1-7/+8
2012-09-11completion: complete branch name for "branch --set-upstream-to="Michael J Gruber1-0/+3
2012-09-11completion: add --set-upstream-to and --unset-upstreamCarlos Martín Nieto1-1/+2
2012-09-11First half of the fifth batch for 1.8.0Junio C Hamano1-0/+24
2012-09-11Cull items fixed in maintenance branchesJunio C Hamano1-38/+0
2012-09-11Start preparing for 1.7.12.1Junio C Hamano2-1/+63
2012-09-11Almost 1.7.11.6Junio C Hamano1-1/+29
2012-09-10gitcli: contrast wildcard given to shell and to gitJunio C Hamano1-0/+17
2012-09-10gitcli: formatting fixJunio C Hamano1-1/+1
2012-09-10t0060: split absolute path test in two to exercise some of it on WindowsJohannes Sixt1-2/+6
2012-09-09mailinfo: strip "RE: " prefixJunio C Hamano1-1/+3
2012-09-09attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano3-3/+3
2012-09-09merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano3-7/+35
2012-09-09Document MKDIR_WO_TRAILING_SLASH in MakefileJoachim Schmitz1-0/+6
2012-09-09Add a no-op setitimer() wrapperJoachim Schmitz2-0/+23
2012-09-09gitk: Rename 'tagcontents' to 'cached_tagcontent'David Aguilar1-7/+7
2012-09-09gitk: Teach "Reread references" to reload tagsDavid Aguilar1-1/+2
2012-09-08l10n: vi.po: update to v1.7.12-146-g16d26Tran Ngoc Quan1-392/+422
2012-09-07The fourth batch for 1.8.0Junio C Hamano1-0/+52
2012-09-07ls-remote: document the '--get-url' optionStefan Naewe2-1/+6
2012-09-07l10n: de.po: translate 2 new messagesRalf Thielow1-340/+372
2012-09-07fetch --all: pass --tags/--no-tags through to each remoteDan Johnson2-0/+34
2012-09-07l10n: zh_CN.po: translate 2 new messagesJiang Xin1-341/+371
2012-09-07t0060: verify that real_path() removes extra slashesMichael Haggerty1-0/+18
2012-09-07real_path(): properly handle nonexistent top-level pathsMichael Haggerty2-2/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 08:04:42 +0100