{"thread":{"id":"28592","subject":"[BUG] git stash -k show the help message for diff-index","startedAt":"2011-10-05T15:13:34Z","lastAt":"2011-10-06T09:54:21Z","messageCount":3,"participants":["Matthieu Moy","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"176930","messageId":"vpqfwj7v5cx.fsf@bauges.imag.fr","threadId":"28592","inReplyTo":null,"subject":"[BUG] git stash -k show the help message for diff-index","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2011-10-05T15:13:34Z","receivedAt":"2011-10-05T15:13:34Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Everything is in the title. No time to bisect/fix this now, but:\n\n$ git status\n# On branch master\nnothing to commit (working directory clean)\n$ git stash -k\nusage: git diff-index [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\ncommon diff options:\n  -z            output diff-raw with lines terminated with NUL.\n  -p            output patch format.\n  -u            synonym for -p.\n  --patch-with-raw\n                output both a patch and the diff-raw format.\n  --stat        show diffstat instead of patch.\n  --numstat     show numeric diffstat instead of patch.\n  --patch-with-stat\n                output a patch and prepend its diffstat.\n  --name-only   show only names of changed files.\n  --name-status show names and status of changed files.\n  --full-index  show full object name on index lines.\n  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n  -R            swap input file pairs.\n  -B            detect complete rewrites.\n  -M            detect renames.\n  -C            detect copies.\n  --find-copies-harder\n                try unchanged files as candidate for copy detection.\n  -l<n>         limit rename attempts up to <n> paths.\n  -O<file>      reorder diffs according to the <file>.\n  -S<string>    find filepair whose only one side contains the string.\n  --pickaxe-all\n                show all files diff when -S is used and hit is found.\n  -a  --text    treat all files as text.\n\nusage: git diff-index [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\ncommon diff options:\n  -z            output diff-raw with lines terminated with NUL.\n  -p            output patch format.\n  -u            synonym for -p.\n  --patch-with-raw\n                output both a patch and the diff-raw format.\n  --stat        show diffstat instead of patch.\n  --numstat     show numeric diffstat instead of patch.\n  --patch-with-stat\n                output a patch and prepend its diffstat.\n  --name-only   show only names of changed files.\n  --name-status show names and status of changed files.\n  --full-index  show full object name on index lines.\n  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n  -R            swap input file pairs.\n  -B            detect complete rewrites.\n  -M            detect renames.\n  -C            detect copies.\n  --find-copies-harder\n                try unchanged files as candidate for copy detection.\n  -l<n>         limit rename attempts up to <n> paths.\n  -O<file>      reorder diffs according to the <file>.\n  -S<string>    find filepair whose only one side contains the string.\n  --pickaxe-all\n                show all files diff when -S is used and hit is found.\n  -a  --text    treat all files as text.\n\nSaved working directory and index state WIP on master: 977c790 foo\nHEAD is now at 977c790 foo\n\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"176944","messageId":"7v4nzn8hcp.fsf@alter.siamese.dyndns.org","threadId":"28592","inReplyTo":"vpqfwj7v5cx.fsf@bauges.imag.fr","subject":"Re: [BUG] git stash -k show the help message for diff-index","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-10-05T17:43:02Z","receivedAt":"2011-10-05T17:43:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:\n\n> Everything is in the title. No time to bisect/fix this now, but:\n>\n> $ git status\n> # On branch master\n> nothing to commit (working directory clean)\n> $ git stash -k\n> usage: git diff-index [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n\nHmm, does not reproduce.\n\n: alter victim-2.git/master; git status\n# On branch master\nnothing to commit (working directory clean)\n: alter victim-2.git/master; git stash -k\nNo local changes to save\n: alter victim-2.git/master; git version\ngit version 1.7.7\n"},{"id":"177013","messageId":"vpqhb3mcunm.fsf@bauges.imag.fr","threadId":"28592","inReplyTo":"7v4nzn8hcp.fsf@alter.siamese.dyndns.org","subject":"Re: [BUG] git stash -k show the help message for diff-index","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2011-10-06T09:54:21Z","receivedAt":"2011-10-06T09:54:21Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Hmm, does not reproduce.\n>\n> : alter victim-2.git/master; git status\n> # On branch master\n> nothing to commit (working directory clean)\n> : alter victim-2.git/master; git stash -k\n> No local changes to save\n> : alter victim-2.git/master; git version\n> git version 1.7.7\n\nSorry, I should have mentionned that: I had the bug with next.\n\nI've tried bisecting it down, but the bug mysteriously disappeared\nduring the bisect (I did have bad and good commits during bisect, but at\nthe end, I had only good commits, and the bad ones weren't\nreproducible).\n\nI can't reproduce anymore.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"}]}