summaryrefslogtreecommitdiff
path: root/t/t7060-wtstatus.sh
AgeCommit message (Expand)AuthorFilesLines
2011-05-02Merge branch 'ab/i18n-fixup'Libravatar Junio C Hamano1-3/+3
2011-05-02Merge branch 'mz/maint-rename-unmerged'Libravatar Junio C Hamano1-0/+62
2011-04-13i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012...Libravatar Junio C Hamano1-3/+3
2011-03-23diffcore-rename: don't consider unmerged path as sourceLibravatar Martin von Zweigbergk1-0/+62
2011-03-09i18n: git-status basic messagesLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2009-12-12status/commit: do not suggest "reset HEAD <path>" while mergingLibravatar Junio C Hamano1-1/+0
2009-12-12commit/status: "git add <path>" is not necessarily how to resolveLibravatar Junio C Hamano1-1/+1
2009-08-22git status: not "commit --dry-run" anymoreLibravatar Junio C Hamano1-3/+5
2009-08-06status: show worktree status of conflicted paths separatelyLibravatar Junio C Hamano1-0/+27
2009-08-05diff-index: report unmerged new entriesLibravatar Junio C Hamano1-0/+31