summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Unify appending signoff in format-patch, commit and sequencerBrandon Casey2013-02-122-95/+27
* format-patch: update append_signoff prototypeNguyễn Thái Ngọc Duy2013-02-123-17/+15
* t4014: more tests about appending s-o-b linesNguyễn Thái Ngọc Duy2013-02-121-0/+241
* sequencer.c: teach append_signoff to avoid adding a duplicate newlineBrandon Casey2013-02-121-2/+13
* sequencer.c: teach append_signoff how to detect duplicate s-o-bBrandon Casey2013-02-124-17/+50
* sequencer.c: always separate "(cherry picked from" from commit bodyBrandon Casey2013-02-122-63/+118
* sequencer.c: require a conforming footer to be preceded by a blank lineBrandon Casey2013-02-121-1/+5
* sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footerBrandon Casey2013-02-122-14/+92
* t/t3511: add some tests of 'cherry-pick -s' functionalityBrandon Casey2013-02-121-0/+111
* t/test-lib-functions.sh: allow to specify the tag name to test_commitBrandon Casey2013-02-121-4/+4
* commit, cherry-pick -s: remove broken support for multiline rfc2822 fieldsBrandon Casey2013-02-121-6/+0
* sequencer.c: rework search for start of footer to improve clarityJonathan Nieder2013-02-121-4/+6
* Update draft release notes to 1.8.1Junio C Hamano2012-11-251-0/+14
* Merge branch 'rr/submodule-diff-config'Junio C Hamano2012-11-257-24/+98
|\
| * submodule: display summary header in boldRamkumar Ramachandra2012-11-183-6/+6
| * diff: rename "set" variableJeff King2012-11-182-6/+21
| * diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-184-6/+65
| * Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-11-182-6/+6
* | Merge branch 'nd/maint-compat-fnmatch-fix'Junio C Hamano2012-11-251-1/+1
|\ \
| * | compat/fnmatch: fix off-by-one character class's length checkNguyễn Thái Ngọc Duy2012-11-201-1/+1
* | | Merge branch 'bc/do-not-recurse-in-die'Junio C Hamano2012-11-251-0/+15
|\ \ \
| * | | usage.c: detect recursion in die routines and bail out immediatelyBrandon Casey2012-11-151-0/+15
| |/ /
* | | Merge branch 'mk/complete-tcsh'Junio C Hamano2012-11-251-0/+63
|\ \ \
| * | | tcsh-completion re-using git-completion.bashMarc Khouzam2012-11-161-0/+63
* | | | Merge branch 'jh/update-ref-d-through-symref'Junio C Hamano2012-11-252-1/+19
|\ \ \ \
| * | | | Fix failure to delete a packed ref through a symrefJohan Herland2012-10-212-2/+2
| * | | | t1400-update-ref: Add test verifying bug with symrefs in delete_ref()Johan Herland2012-10-211-0/+18
* | | | | Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano2012-11-254-36/+42
|\ \ \ \ \
| * | | | | Fix "git diff --stat" for interesting - but empty - file changesLinus Torvalds2012-10-174-36/+42
* | | | | | Merge branch 'sg/complete-help-undup'Junio C Hamano2012-11-251-1/+1
|\ \ \ \ \ \
| * | | | | | completion: remove 'help' duplicate from porcelain commandsSZEDER Gábor2012-11-141-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Sync with 1.8.0.1Junio C Hamano2012-11-254-4/+17
|\ \ \ \ \ \
| * | | | | | Git 1.8.0.1v1.8.0.1Junio C Hamano2012-11-253-3/+16
| * | | | | | Merge branch 'jk/checkout-out-of-unborn' into maintJunio C Hamano2012-11-251-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cn/config-missing-path' into maintJunio C Hamano2012-11-252-1/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-gitweb-xss' into maintJunio C Hamano2012-11-252-0/+16
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Completion must sort before using uniqMarc Khouzam2012-11-241-1/+1
* | | | | | | | | | Update draft release notes for 1.8.1Junio C Hamano2012-11-211-0/+10
* | | | | | | | | | Merge branch 'esr/maint-doc-fast-import'Junio C Hamano2012-11-211-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc/fast-import: clarify how content states are builtEric S. Raymond2012-11-081-2/+6
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'wtk/submodule-doc-fixup'Junio C Hamano2012-11-212-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-submodule: wrap branch option with "<>" in usage strings.W. Trevor King2012-10-252-2/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'so/prompt-command'Junio C Hamano2012-11-211-8/+90
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | coloured git-prompt: paint detached HEAD marker in redJunio C Hamano2012-10-171-1/+1
| * | | | | | | | | | Fix up colored git-promptSimon Oosthoek2012-10-161-23/+32
| * | | | | | | | | | show color hints based on state of the git treeSimon Oosthoek2012-10-111-1/+35
| * | | | | | | | | | Allow __git_ps1 to be used in PROMPT_COMMANDSimon Oosthoek2012-10-111-6/+45
* | | | | | | | | | | Merge branch 'jk/config-ignore-duplicates'Junio C Hamano2012-11-214-196/+232
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/config.c: Fix a sparse warningRamsay Jones2012-10-291-1/+1
| * | | | | | | | | | | git-config: use git_config_with_optionsJeff King2012-10-241-42/+2