{"thread":{"id":"17685","subject":"[Bug?] Problem with git show when not in repository's root dir","startedAt":"2009-02-09T23:23:08Z","lastAt":"2009-02-09T23:23:08Z","messageCount":1,"participants":["Nazri Ramliy"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"103928","messageId":"544dda350902091523i2989318bq3ee0f120ca77b7dd@mail.gmail.com","threadId":"17685","inReplyTo":null,"subject":"[Bug?] Problem with git show when not in repository's root dir","fromName":"Nazri Ramliy","fromEmail":"ayiehere@gmail.com","sentAt":"2009-02-09T23:23:08Z","receivedAt":"2009-02-09T23:23:08Z","isPatch":false,"sender":{"key":"ayiehere@gmail.com","avatar":"https://avatars.githubusercontent.com/u/164756?v=4"},"body":"Repository structure:\n\na/         - repository's root dir (.git is in here)\na/a.txt\na/b/b.txt\n\nAfter merging with conflict:\n\n% git status\na.txt: needs merge\n# On branch b1\n# Changed but not updated:\n#   (use \"git add <file>...\" to update what will be committed)\n#   (use \"git checkout -- <file>...\" to discard changes in working directory)\n#\n#       unmerged:   ../a.txt\n#\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n\n% git show :1:a.txt\nHello\nGood World\nBye\n\n% git show :2:a.txt\nHello\nThis is where it conflicts\nBye\n\n% cd b\n\n% git status\na.txt: needs merge\n# On branch b1\n# Changed but not updated:\n#   (use \"git add <file>...\" to update what will be committed)\n#   (use \"git checkout -- <file>...\" to discard changes in working directory)\n#\n#       unmerged:   ../a.txt\n#\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n\n% git show :2:../a.txt    # here's the problem\nfatal: ambiguous argument ':2:../a.txt': unknown revision or path not\nin the working tree.\nUse '--' to separate paths from revisions\n\nShould \"git show\" be taught with the \"--ours\" and \"--theirs\" options?\ngit checkout knows them, but git show doesn't.  At least to me, \"--ours\"\nand \"--theirs\" are easier to understand than :1: and :2:\n\nnazri.\n"}]}