summaryrefslogtreecommitdiffstats
path: root/merge-recursive.c (unfollow)
Commit message (Expand)AuthorFilesLines
2015-08-28Git 2.5.1v2.5.1Junio C Hamano3-2/+19
2015-08-28Mingw: verify both ends of the pipe () callJose F. Morales1-1/+1
2015-08-27Sixth batch for 2.6Junio C Hamano1-0/+17
2015-08-26i18n: am: fix typo in description of -b optionJiang Xin1-1/+1
2015-08-26trailer: retitle a test and correct an in-comment messageChristian Couder2-2/+3
2015-08-26pull: pass upload_pack only when it was givenJunio C Hamano1-1/+1
2015-08-26Fifth batch for 2.6Junio C Hamano1-0/+33
2015-08-25builtin/log.c: minor reformatJunio C Hamano1-4/+2
2015-08-25write_file(): drop caller-supplied LF from calls to create a one-liner fileJunio C Hamano6-10/+10
2015-08-25write_file_v(): do not leave incomplete line at the endJunio C Hamano2-8/+3
2015-08-25generate-cmdlist: re-implement as shell scriptEric Sunshine3-52/+52
2015-08-24write_file(): drop "fatal" parameterJunio C Hamano10-19/+40
2015-08-24builtin/am: make sure state files are textJunio C Hamano1-2/+8
2015-08-24builtin/am: introduce write_state_*() helper functionsJunio C Hamano1-27/+41
2015-08-24rev-list: make it obvious that we do not support notesJeff King4-0/+9
2015-08-24config: silence warnings for command names with invalid keysJeff King5-12/+43
2015-08-21wt-status: move #include "pathspec.h" to the headerSZEDER Gábor2-1/+1
2015-08-21trailer: ignore first line of messageChristian Couder2-2/+16
2015-08-21Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableAndreas Schwab1-1/+1
2015-08-21log: show merge commit when --cc is givenJunio C Hamano1-0/+4
2015-08-21log: when --cc is given, default to -p unless told otherwiseJunio C Hamano1-0/+4
2015-08-20log: rename "tweak" helpersJunio C Hamano1-5/+6
2015-08-20get_urlmatch: avoid useless strbuf writeJeff King1-4/+1
2015-08-20format_config: simplify buffer handlingJeff King1-22/+16
2015-08-20format_config: don't init strbufJeff King1-2/+1
2015-08-20config: restructure format_config() for better control flowSZEDER Gábor1-41/+37
2015-08-20t3020: fix typo in test descriptionSZEDER Gábor1-1/+1
2015-08-20ps_matched: xcalloc() takes nmemb and then element sizeJunio C Hamano2-2/+2
2015-08-19Fourth batch for 2.6Junio C Hamano1-1/+34
2015-08-19Start preparing for 2.5.1Junio C Hamano2-1/+50
2015-08-19submodule: allow erroneous values for the fetchRecurseSubmodules optionHeiko Voigt6-17/+66
2015-08-19submodule: use new config API for worktree configurationsHeiko Voigt9-138/+104
2015-08-19submodule: extract functions for config set and lookupHeiko Voigt1-45/+97
2015-08-19submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt9-0/+671
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan2-13/+60
2015-08-19untracked cache: fix entry invalidationNguyễn Thái Ngọc Duy2-13/+83
2015-08-19untracked-cache: fix subdirectory handlingDavid Turner2-7/+79
2015-08-19t7063: use --force-untracked-cache to speed up a bitNguyễn Thái Ngọc Duy1-1/+1
2015-08-18notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller4-1/+64
2015-08-18notes: add notes.mergeStrategy option to select default strategyJacob Keller4-3/+76
2015-08-18notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller1-0/+12
2015-08-18notes: extract parse_notes_merge_strategy to notes-utilsJacob Keller3-11/+20
2015-08-18notes: extract enum notes_merge_strategy to notes-utils.hJacob Keller2-7/+11
2015-08-18notes: document cat_sort_uniq rewriteModeJacob Keller2-4/+5
2015-08-18Third batch for 2.6Junio C Hamano1-0/+11
2015-08-17send-email: provide whitelist of SMTP AUTH mechanismsJan Viktorin2-1/+38
2015-08-17po/README: Update directions for l10n contributorsPhilip Oakley1-0/+19
2015-08-17http: add support for specifying the SSL versionElia Pinto3-1/+56
2015-08-14config: close config file handle in case of errorSven Strickroth1-1/+4
2015-08-12credential-cache--daemon: use tempfile moduleMichael Haggerty1-20/+6
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 11:04:12 +0100