summaryrefslogtreecommitdiff
path: root/t/t7060-wtstatus.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/i18n-fixup'Junio C Hamano2011-05-021-3/+3
|\
| * i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012...Junio C Hamano2011-04-131-3/+3
* | Merge branch 'mz/maint-rename-unmerged'Junio C Hamano2011-05-021-0/+62
|\ \ | |/ |/|
| * diffcore-rename: don't consider unmerged path as sourceMartin von Zweigbergk2011-03-231-0/+62
* | i18n: git-status basic messagesÆvar Arnfjörð Bjarmason2011-03-091-1/+1
|/
* status/commit: do not suggest "reset HEAD <path>" while mergingJunio C Hamano2009-12-121-1/+0
* commit/status: "git add <path>" is not necessarily how to resolveJunio C Hamano2009-12-121-1/+1
* git status: not "commit --dry-run" anymoreJunio C Hamano2009-08-221-3/+5
* status: show worktree status of conflicted paths separatelyJunio C Hamano2009-08-061-0/+27
* diff-index: report unmerged new entriesJunio C Hamano2009-08-051-0/+31