Re: Trouble in making an commit .

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 commit
usage: git diff-index [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
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=<n>  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<n>         limit rename attempts up to <n> paths.
  -O<file>      reorder diffs according to the <file>.
  -S<string>    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 <file>..." to unstage)
#
# modified:   drivers/staging/comedi/comedi_fops.c
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." 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 <kristof@xxxxxxxxxx> wrote:



> On 18 Jun 2015, at 10:14, Sébastien Hinderer <Sebastien.Hinderer@xxxxxxxxxxxx> wrote:
>
> Kristof Provost (2015/06/18 09:54 +0200):
>>
>>> On 17 Jun 2015, at 20:01, Santhosh Pai <santhosh.pai88@xxxxxxxxx> 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] [<common diff options>] <tree-ish> [<path>...]
>> 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] [--] <pathspec>…

That’s with git (git version 2.3.2 (Apple Git-55)).

Regards,

Kristof
_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@xxxxxxxxxxxxxxxxx
http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies


_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@xxxxxxxxxxxxxxxxx
http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

[Index of Archives]     [Newbies FAQ]     [Linux Kernel Mentors]     [Linux Kernel Development]     [IETF Annouce]     [Git]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux SCSI]     [Linux ACPI]
  Powered by Linux