Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/status-partial-refresh' | Junio C Hamano | 2010-01-20 | 1 | -1/+1 |
|\ | |||||
| * | status: only touch path we may need to check | Nguyễn Thái Ngọc Duy | 2010-01-15 | 1 | -1/+1 |
* | | Merge branch 'mm/conflict-advice' | Junio C Hamano | 2010-01-20 | 1 | -2/+12 |
|\ \ | |||||
| * | | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 2010-01-12 | 1 | -2/+12 |
* | | | Merge branch 'jk/warn-author-committer-after-commit' | Junio C Hamano | 2010-01-20 | 1 | -3/+39 |
|\ \ \ | |||||
| * | | | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere | Junio C Hamano | 2010-01-17 | 1 | -2/+2 |
| * | | | commit.c::print_summary: do not release the format string too early | Junio C Hamano | 2010-01-17 | 1 | -1/+1 |
| * | | | commit: allow suppression of implicit identity advice | Jeff King | 2010-01-14 | 1 | -2/+4 |
| * | | | commit: show interesting ident information in summary | Jeff King | 2010-01-14 | 1 | -3/+37 |
| |/ / | |||||
* | | | Merge branch 'jc/ident' | Junio C Hamano | 2010-01-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere | Junio C Hamano | 2010-01-17 | 1 | -1/+1 |
| * | | | ident.c: check explicit identity for name and email separately | Junio C Hamano | 2010-01-10 | 1 | -1/+1 |
* | | | | Merge branch 'jc/rerere' | Junio C Hamano | 2010-01-18 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -1/+1 |
* | | | | | Merge branch 'jh/commit-status' | Junio C Hamano | 2010-01-17 | 1 | -2/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | commit: support commit.status, --status, and --no-status | James P. Howard, II | 2010-01-13 | 1 | -2/+7 |
| |/ / / | |||||
* | | | | Merge branch 'nd/sparse' | Junio C Hamano | 2010-01-13 | 1 | -1/+9 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | commit: correctly respect skip-worktree bit | Nguyễn Thái Ngọc Duy | 2009-12-14 | 1 | -4/+7 |
| * | | | Teach Git to respect skip-worktree bit (reading part) | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -0/+5 |
* | | | | Merge branch 'mv/commit-date' | Junio C Hamano | 2010-01-07 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | builtin-commit: add --date option | Miklos Vajna | 2009-12-03 | 1 | -1/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-30 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-12-30 | 1 | -2/+4 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-12-29 | 1 | -2/+4 |
| | |\ \ \ | |||||
| | | * | | | commit: --cleanup is a message option | Greg Price | 2009-12-29 | 1 | -2/+4 |
* | | | | | | Merge branch 'jk/1.7.0-status' | Junio C Hamano | 2009-12-27 | 1 | -20/+104 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | status/commit: do not suggest "reset HEAD <path>" while merging | Junio C Hamano | 2009-12-12 | 1 | -0/+2 |
| * | | | | | commit/status: check $GIT_DIR/MERGE_HEAD only once | Junio C Hamano | 2009-12-12 | 1 | -6/+4 |
| * | | | | | status: reduce duplicated setup code | Jeff King | 2009-12-07 | 1 | -12/+7 |
| * | | | | | status: disable color for porcelain format | Jeff King | 2009-12-07 | 1 | -2/+2 |
| * | | | | | status -s: obey color.status | Michael J Gruber | 2009-12-05 | 1 | -0/+4 |
| * | | | | | builtin-commit: refactor short-status code into wt-status.c | Michael J Gruber | 2009-12-05 | 1 | -97/+4 |
| * | | | | | status -s: respect the status.relativePaths option | Michael J Gruber | 2009-11-26 | 1 | -0/+2 |
| * | | | | | commit: support alternate status formats | Jeff King | 2009-09-05 | 1 | -7/+32 |
| * | | | | | status: add --porcelain output format | Jeff King | 2009-09-05 | 1 | -1/+8 |
| * | | | | | status: refactor format option parsing | Jeff King | 2009-09-05 | 1 | -7/+14 |
| * | | | | | status: refactor short-mode printing to its own function | Jeff King | 2009-09-05 | 1 | -20/+25 |
| * | | | | | status: typo fix in usage | Jeff King | 2009-09-05 | 1 | -1/+1 |
| * | | | | | git status: not "commit --dry-run" anymore | Junio C Hamano | 2009-08-22 | 1 | -25/+4 |
| * | | | | | git stat -s: short status output | Junio C Hamano | 2009-08-22 | 1 | -8/+106 |
| * | | | | | git stat: the beginning of "status that is not a dry-run of commit" | Junio C Hamano | 2009-08-22 | 1 | -10/+65 |
* | | | | | | Merge branch 'maint' to sync with 1.6.5.7 | Junio C Hamano | 2009-12-16 | 1 | -1/+3 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | ignore unknown color configuration | Jeff King | 2009-12-16 | 1 | -1/+3 |
* | | | | | | Merge branch 'em/commit-claim' | Junio C Hamano | 2009-11-30 | 1 | -3/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit -c/-C/--amend: reset timestamp and authorship to committer with --rese... | Erick Mattos | 2009-11-04 | 1 | -3/+9 |
* | | | | | | | Merge branch 'mm/config-pathname-tilde-expand' | Junio C Hamano | 2009-11-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Expand ~ and ~user in core.excludesfile, commit.template | Matthieu Moy | 2009-11-17 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/commit-s-subject-is-not-a-footer' | Junio C Hamano | 2009-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | builtin-commit.c: fix logic to omit empty line before existing footers | Junio C Hamano | 2009-11-06 | 1 | -1/+1 |
* | | | | | | fixup tr/stash-format merge | Junio C Hamano | 2009-10-30 | 1 | -2/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |