summaryrefslogtreecommitdiff
path: root/builtin-commit.c
Commit message (Expand)AuthorAgeFilesLines
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-1310/+0
* Merge branch 'nd/status-partial-refresh'Junio C Hamano2010-01-201-1/+1
|\
| * status: only touch path we may need to checkNguyễn Thái Ngọc Duy2010-01-151-1/+1
* | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-2/+12
|\ \
| * | Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-2/+12
* | | Merge branch 'jk/warn-author-committer-after-commit'Junio C Hamano2010-01-201-3/+39
|\ \ \
| * | | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereJunio C Hamano2010-01-171-2/+2
| * | | commit.c::print_summary: do not release the format string too earlyJunio C Hamano2010-01-171-1/+1
| * | | commit: allow suppression of implicit identity adviceJeff King2010-01-141-2/+4
| * | | commit: show interesting ident information in summaryJeff King2010-01-141-3/+37
| |/ /
* | | Merge branch 'jc/ident'Junio C Hamano2010-01-201-1/+1
|\ \ \
| * | | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhereJunio C Hamano2010-01-171-1/+1
| * | | ident.c: check explicit identity for name and email separatelyJunio C Hamano2010-01-101-1/+1
* | | | Merge branch 'jc/rerere'Junio C Hamano2010-01-181-1/+1
|\ \ \ \
| * | | | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-1/+1
* | | | | Merge branch 'jh/commit-status'Junio C Hamano2010-01-171-2/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | commit: support commit.status, --status, and --no-statusJames P. Howard, II2010-01-131-2/+7
| |/ / /
* | | | Merge branch 'nd/sparse'Junio C Hamano2010-01-131-1/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | commit: correctly respect skip-worktree bitNguyễn Thái Ngọc Duy2009-12-141-4/+7
| * | | Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy2009-08-231-0/+5
* | | | Merge branch 'mv/commit-date'Junio C Hamano2010-01-071-1/+5
|\ \ \ \
| * | | | builtin-commit: add --date optionMiklos Vajna2009-12-031-1/+5
| | |/ / | |/| |
* | | | Merge branch 'maint'Junio C Hamano2009-12-301-2/+4
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-12-301-2/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-12-291-2/+4
| | |\ \ \
| | | * | | commit: --cleanup is a message optionGreg Price2009-12-291-2/+4
* | | | | | Merge branch 'jk/1.7.0-status'Junio C Hamano2009-12-271-20/+104
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | status/commit: do not suggest "reset HEAD <path>" while mergingJunio C Hamano2009-12-121-0/+2
| * | | | | commit/status: check $GIT_DIR/MERGE_HEAD only onceJunio C Hamano2009-12-121-6/+4
| * | | | | status: reduce duplicated setup codeJeff King2009-12-071-12/+7
| * | | | | status: disable color for porcelain formatJeff King2009-12-071-2/+2
| * | | | | status -s: obey color.statusMichael J Gruber2009-12-051-0/+4
| * | | | | builtin-commit: refactor short-status code into wt-status.cMichael J Gruber2009-12-051-97/+4
| * | | | | status -s: respect the status.relativePaths optionMichael J Gruber2009-11-261-0/+2
| * | | | | commit: support alternate status formatsJeff King2009-09-051-7/+32
| * | | | | status: add --porcelain output formatJeff King2009-09-051-1/+8
| * | | | | status: refactor format option parsingJeff King2009-09-051-7/+14
| * | | | | status: refactor short-mode printing to its own functionJeff King2009-09-051-20/+25
| * | | | | status: typo fix in usageJeff King2009-09-051-1/+1
| * | | | | git status: not "commit --dry-run" anymoreJunio C Hamano2009-08-221-25/+4
| * | | | | git stat -s: short status outputJunio C Hamano2009-08-221-8/+106
| * | | | | git stat: the beginning of "status that is not a dry-run of commit"Junio C Hamano2009-08-221-10/+65
* | | | | | Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-161-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | ignore unknown color configurationJeff King2009-12-161-1/+3
* | | | | | Merge branch 'em/commit-claim'Junio C Hamano2009-11-301-3/+9
|\ \ \ \ \ \
| * | | | | | commit -c/-C/--amend: reset timestamp and authorship to committer with --rese...Erick Mattos2009-11-041-3/+9
* | | | | | | Merge branch 'mm/config-pathname-tilde-expand'Junio C Hamano2009-11-221-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy2009-11-171-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/commit-s-subject-is-not-a-footer'Junio C Hamano2009-11-061-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | builtin-commit.c: fix logic to omit empty line before existing footersJunio C Hamano2009-11-061-1/+1