summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* log: use true parents for diff when walking reflogstr/log-full-diff-keep-true-parentsThomas Rast2013-08-052-3/+47
* log: use true parents for diff even when rewritingThomas Rast2013-08-017-3/+90
* 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
* | | | | | | Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'Junio C Hamano2013-07-221-11/+6
|\ \ \ \ \ \ \
| * | | | | | | upload-pack: remove a piece of dead codemk/upload-pack-off-by-one-dead-code-removalMatthijs Kooijman2013-07-151-11/+6
* | | | | | | | Merge branch 'jk/t0008-sigpipe-fix'Junio C Hamano2013-07-221-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | t0008: avoid SIGPIPE race condition on fifojk/t0008-sigpipe-fixJeff King2013-07-121-2/+10
* | | | | | | | | Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-2229-85/+93
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-0929-85/+93
* | | | | | | | | | Merge branch 'jk/gcc-function-attributes'Junio C Hamano2013-07-2210-5/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add the LAST_ARG_MUST_BE_NULL macrojk/gcc-function-attributesRamsay Jones2013-07-195-5/+12
| * | | | | | | | | | wt-status: use "format" function attribute for status_printfJeff King2013-07-091-4/+4
| * | | | | | | | | | use "sentinel" function attribute for variadic listsJeff King2013-07-094-0/+5
View Lorry Controller Status