summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Documentation: remove --prune from pack-refs examplesJonathon Mah2013-07-181-2/+2
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rh/template-updates'Junio C Hamano2013-07-241-14/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | templates: spell ASCII in uppercase in pre-commit hookrh/template-updatesRichard Hartmann2013-07-151-3/+3
| * | | | | | | | | | | | templates: Reformat pre-commit hook's messageRichard Hartmann2013-07-151-4/+2
| * | | | | | | | | | | | templates: Use heredoc in pre-commit hookRichard Hartmann2013-07-151-12/+13
* | | | | | | | | | | | | Merge branch 'mh/ref-races-optim-invalidate-cached'Junio C Hamano2013-07-241-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | refs: do not invalidate the packed-refs cache unnecessarilyMichael Haggerty2013-06-201-3/+6
* | | | | | | | | | | | | | Merge branch 'sb/misc-fixes'Junio C Hamano2013-07-243-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diff.c: Do not initialize a variable, which gets reassigned anyway.sb/misc-fixesStefan Beller2013-07-151-3/+1
| * | | | | | | | | | | | | | commit: Fix a memory leak in determine_author_infoStefan Beller2013-07-151-1/+0
| * | | | | | | | | | | | | | daemon.c:handle: Remove unneeded check for null pointer.Stefan Beller2013-07-151-1/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'tr/line-log'Junio C Hamano2013-07-242-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ...tr/line-logJunio C Hamano2013-07-241-1/+0
| * | | | | | | | | | | | | | Merge branch 'es/line-log-further-fixes' into tr/line-logJunio C Hamano2013-07-233-7/+153
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | line-log: fix "log -LN" crash when N is last line of filees/line-log-further-fixesEric Sunshine2013-07-232-1/+2
| | * | | | | | | | | | | | | | range-set: satisfy non-empty ranges invariantEric Sunshine2013-07-232-1/+4
| | * | | | | | | | | | | | | | t4211: demonstrate crash when first -L encountered is empty rangeEric Sunshine2013-07-231-0/+5
| | * | | | | | | | | | | | | | t4211: demonstrate empty -L range crashEric Sunshine2013-07-231-0/+8
| | * | | | | | | | | | | | | | range-set: fix sort_and_merge_range_set() corner case bugEric Sunshine2013-07-231-3/+3
* | | | | | | | | | | | | | | | open_istream: remove unneeded check for null pointerStefan Beller2013-07-231-1/+1
* | | | | | | | | | | | | | | | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | t7600: fix typo in test titlemv/merge-ff-tristateJunio C Hamano2013-07-231-1/+1
* | | | | | | | | | | | | | | | Sync with Git 1.8.3.4Junio C Hamano2013-07-224-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Git 1.8.3.4v1.8.3.4Junio C Hamano2013-07-222-2/+3
| * | | | | | | | | | | | | | | | update URL to the marc.info mail archiveOndřej Bílka2013-07-223-4/+4
* | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-07-221-0/+50
* | | | | | | | | | | | | | | | | Merge branch 'jc/name-rev-exact-ref'Junio C Hamano2013-07-223-32/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | describe: fix --contains when a tag is given as inputjc/name-rev-exact-refJunio C Hamano2013-07-183-2/+30
| * | | | | | | | | | | | | | | | | name-rev: differentiate between tags and commits they point atJunio C Hamano2013-07-182-8/+28
| * | | | | | | | | | | | | | | | | describe: use argv-arrayJunio C Hamano2013-07-091-15/+15
| * | | | | | | | | | | | | | | | | name-rev: allow converting the exact object name at the tip of a refJunio C Hamano2013-07-091-1/+58
| * | | | | | | | | | | | | | | | | name-ref: factor out name shortening logic from name_ref()Junio C Hamano2013-07-071-7/+12
* | | | | | | | | | | | | | | | | | Merge branch 'rr/send-email-ssl-verify'Junio C Hamano2013-07-223-3/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | send-email: be explicit with SSL certificate verificationrr/send-email-ssl-verifyRamkumar Ramachandra2013-07-183-3/+48
* | | | | | | | | | | | | | | | | | | Merge branch 'es/check-mailmap'Junio C Hamano2013-07-229-0/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | t4203: test check-mailmap command invocationes/check-mailmapEric Sunshine2013-07-131-0/+43
| * | | | | | | | | | | | | | | | | | builtin: add git-check-mailmap commandEric Sunshine2013-07-138-0/+119
* | | | | | | | | | | | | | | | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-07-2214-171/+1473
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | test: run testcases with POSIX absolute paths on WindowsJiang Xin2013-06-262-21/+28
| * | | | | | | | | | | | | | | | | | | test: add t7301 for git-clean--interactiveJiang Xin2013-06-261-0/+439
| * | | | | | | | | | | | | | | | | | | git-clean: add documentation for interactive git-cleanJiang Xin2013-06-261-2/+63
| * | | | | | | | | | | | | | | | | | | git-clean: add ask each interactive actionJiang Xin2013-06-261-0/+36
| * | | | | | | | | | | | | | | | | | | git-clean: add select by numbers interactive actionJiang Xin2013-06-261-0/+39
| * | | | | | | | | | | | | | | | | | | git-clean: add filter by pattern interactive actionJiang Xin2013-06-261-0/+68
| * | | | | | | | | | | | | | | | | | | git-clean: use a git-add-interactive compatible UIJiang Xin2013-06-261-29/+427
| * | | | | | | | | | | | | | | | | | | git-clean: add colors to interactive git-cleanJiang Xin2013-06-262-9/+81
| * | | | | | | | | | | | | | | | | | | git-clean: show items of del_list in columnsJiang Xin2013-06-262-9/+44
| * | | | | | | | | | | | | | | | | | | git-clean: add support for -i/--interactiveJiang Xin2013-06-262-7/+60
| * | | | | | | | | | | | | | | | | | | git-clean: refactor git-clean into two phasesJiang Xin2013-06-261-19/+45
| * | | | | | | | | | | | | | | | | | | write_name{_quoted_relative,}(): remove redundant parametersJiang Xin2013-06-263-13/+10