summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* line-log: fix crash when --first-parent is usedtm/line-log-first-parentTzvetan Mikov2014-11-042-0/+8
* 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
| * | | | | | | | quote_path_relative(): remove redundant parameterJiang Xin2013-06-266-29/+24
| * | | | | | | | quote.c: substitute path_relative with relative_pathJiang Xin2013-06-262-55/+9
| * | | | | | | | path.c: refactor relative_path(), not only strip prefixJiang Xin2013-06-265-51/+111
| * | | | | | | | test: add test cases for relative_pathJiang Xin2013-06-262-0/+62
* | | | | | | | | Merge branch 'hv/config-from-blob'Junio C Hamano2013-07-225-53/+278
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | do not die when error in config parsing of buf occursHeiko Voigt2013-07-121-2/+8
| * | | | | | | | | teach config --blob option to parse config from databaseHeiko Voigt2013-07-125-7/+193
| * | | | | | | | | config: make parsing stack struct independent from actual data sourceHeiko Voigt2013-07-121-21/+43
| * | | | | | | | | config: drop cf validity check in get_next_char()Heiko Voigt2013-07-121-16/+13
| * | | | | | | | | config: factor out config file stack managementHeiko Voigt2013-07-121-14/+28