From mboxrd@z Thu Jan 1 00:00:00 1970 From: santhosh.pai88@yahoo.com (Santhosh Pai) Date: Thu, 18 Jun 2015 17:32:03 +0000 (UTC) Subject: Trouble in making an commit . In-Reply-To: <33325AC3-7C80-46F1-A9F6-7AAF0C7F184F@sigsegv.be> References: <33325AC3-7C80-46F1-A9F6-7AAF0C7F184F@sigsegv.be> Message-ID: <1612602494.1543530.1434648723113.JavaMail.yahoo@mail.yahoo.com> To: kernelnewbies@lists.kernelnewbies.org List-Id: kernelnewbies.lists.kernelnewbies.org Hello All, I had given the o/p of git status in the previous mail , its still the same . 1) Git commit o/p bash-4.2$ git commitusage: git diff-index [-m] [--cached] [] [...]common diff options:? -z ? ? ? ? ? ?output diff-raw with lines terminated with NUL.? -p ? ? ? ? ? ?output patch format.? -u ? ? ? ? ? ?synonym for -p.? --patch-with-raw? ? ? ? ? ? ? ? output both a patch and the diff-raw format.? --stat ? ? ? ?show diffstat instead of patch.? --numstat ? ? show numeric diffstat instead of patch.? --patch-with-stat? ? ? ? ? ? ? ? output a patch and prepend its diffstat.? --name-only ? show only names of changed files.? --name-status show names and status of changed files.? --full-index ?show full object name on index lines.? --abbrev= ?abbreviate object names in diff-tree header and diff-raw.? -R ? ? ? ? ? ?swap input file pairs.? -B ? ? ? ? ? ?detect complete rewrites.? -M ? ? ? ? ? ?detect renames.? -C ? ? ? ? ? ?detect copies.? --find-copies-harder? ? ? ? ? ? ? ? try unchanged files as candidate for copy detection.? -l ? ? ? ? limit rename attempts up to paths.? -O ? ? ?reorder diffs according to the .? -S ? ?find filepair whose only one side contains the string.? --pickaxe-all? ? ? ? ? ? ? ? show all files diff when -S is used and hit is found.? -a ?--text ? ?treat all files as text. bash-4.2$ 2) And the output of the git status is below? bash-4.2$ git status # On branch first-patch# Changes to be committed:# ? (use "git reset HEAD ..." to unstage)## modified: ? drivers/staging/comedi/comedi_fops.c## Changes not staged for commit:# ? (use "git add ..." to update what will be committed)# ? (use "git checkout -- ..." to discard changes in working directory)## modified: ? drivers/net/ethernet/intel/e1000/e1000_main.c# On Thursday, June 18, 2015 1:48 PM, Kristof Provost wrote: > On 18 Jun 2015, at 10:14, S?bastien Hinderer wrote: > > Kristof Provost (2015/06/18 09:54 +0200): >> >>> On 17 Jun 2015, at 20:01, Santhosh Pai wrote: >>> >>> The issue remains the same , i'm unable to perform commit . Below is the o/p >>> >>> bash-4.2$ git add drivers/staging/comedi/comedi_fops.c >>> bash-4.2$ git commit -s -v >>> usage: git diff-index [-m] [--cached] [] [...] >> This is odd. You?re calling git commit, but you?re getting usage >>> information for git diff-index. > > Isn't that because of the -v option which may require this call to show > differences? > This doesn?t suggest that that?s likely: # git commit -v -s --bad-option error: unknown option `bad-option? usage: git commit [options] [--] ? That?s with git (git version 2.3.2 (Apple Git-55)). Regards, Kristof _______________________________________________ Kernelnewbies mailing list Kernelnewbies at kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20150618/69125074/attachment.html