summaryrefslogtreecommitdiffstats
path: root/git-mergetool.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2015-10-07log: Update log.follow doc and add to config.txtEric N. Vander Weele2-4/+10
2015-10-02merge: grammofix in please-commit-before-merge messageAlex Henrie2-2/+2
2015-09-29Git 2.6.1v2.6.1Junio C Hamano4-3/+22
2015-09-29Git 2.5.4v2.5.4Junio C Hamano4-3/+22
2015-09-29Git 2.4.10v2.4.10Junio C Hamano4-3/+22
2015-09-29Git 2.3.10v2.3.10Junio C Hamano4-3/+22
2015-09-28merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King1-1/+2
2015-09-28xdiff: reject files larger than ~1GBJeff King3-1/+14
2015-09-28react to errors in xdi_diffJeff King7-24/+41
2015-09-28Git 2.6v2.6.0Junio C Hamano2-1/+6
2015-09-26http: limit redirection depthBlake Burkhart3-0/+8
2015-09-26http: limit redirection to protocol-whitelistBlake Burkhart4-5/+27
2015-09-26transport: refactor protocol whitelist codeJeff King2-10/+43
2015-09-23submodule: allow only certain protocols for submodule fetchesJeff King2-0/+52
2015-09-23transport: add a protocol-whitelist environment variableJeff King11-1/+254
2015-09-23notes: correct documentation of DWIMery for notes referencesJacob Keller3-3/+12
2015-09-21Git 2.6-rc3v2.6.0-rc3Junio C Hamano1-1/+1
2015-09-21send-email: fix uninitialized var warning for $smtp_authBrian Norris1-1/+1
2015-09-21Documentation: explain optional arguments betterMatthieu Moy9-10/+28
2015-09-21Documentation/grep: fix documentation of -OMatthieu Moy1-2/+2
2015-09-21Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy5-17/+17
2015-09-20l10n: de.po: better language for one stringPhillip Sz1-1/+1
2015-09-20l10n: de.po: translate 2 messagesRalf Thielow1-101/+108
2015-09-20l10n: Update and review Vietnamese translation (2440t)Tran Ngoc Quan1-91/+90
2015-09-20l10n: fr.po v2.6.0 round 2 (2440t)Jean-Noel Avila1-112/+148
2015-09-20l10n: zh_CN: for git v2.6.0 l10n round 2Jiang Xin1-78/+77
2015-09-20l10n: ca.po: update translationAlex Henrie1-1760/+2159
2015-09-20l10n: git.pot: v2.6.0 round 2 (3 improvements)Jiang Xin1-76/+72
2015-09-20l10n: de.po: translate 123 new messagesRalf Thielow1-1640/+2125
2015-09-20l10n: fr.po v2.6.0 round 1 (2441t)Jean-Noel Avila1-1638/+2086
2015-09-17Update RelNotes to 2.6Junio C Hamano1-0/+5
2015-09-17Git 2.5.3v2.5.3Junio C Hamano4-3/+21
2015-09-16blame: handle --first-parentJeff King2-1/+14
2015-09-16mailmap: update my entry with new email addressRamsay Jones1-1/+1
2015-09-15Update RelNotes to 2.6 to describe leftover bits since -rc2Junio C Hamano1-1/+7
2015-09-14Git 2.6-rc2v2.6.0-rc2Junio C Hamano2-1/+9
2015-09-14poll: honor the timeout on Win32Edward Thomson1-2/+14
2015-09-14doc: show usage of branch descriptionPhilip Oakley4-4/+7
2015-09-13gitk: Accelerators for the main menuGiuseppe Bilotta1-23/+23
2015-09-13gitk: Adjust the menu line numbers to compensate for the new entryBeat Bolli1-3/+3
2015-09-13Documentation/config: fix formatting for branch.*.rebase and pull.rebaseAndreas Schwab1-6/+6
2015-09-11tag, update-ref: improve description of option "create-reflog"Ralf Thielow2-2/+2
2015-09-11pull: don't mark values for option "rebase" for translationRalf Thielow1-1/+1
2015-09-11Makefile: use SHELL_PATH when running generate-cmdlist.shAlejandro R. Sedeño1-1/+1
2015-09-10Makefile: allow $(ARFLAGS) specified from the command lineJunio C Hamano1-3/+6
2015-09-10git-svn: parse authors file more lenientlyMichael J Gruber1-1/+1
2015-09-10Makefile: fix MAKEFLAGS tests with multiple flagsJohn Keeping1-2/+2
2015-09-09am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexJohannes Schindelin1-1/+1
2015-09-09l10n: sv.po: Update Swedish translation (2441t0f0u)Peter Krefting1-1621/+2102
2015-09-09Release Notes: typofixJunio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 13:05:47 +0100