From 82217626025ad6b74c806eadf3d4e42eae4d278e Mon Sep 17 00:00:00 2001 From: Lukas Mai Date: Thu, 10 Dec 2015 01:58:05 +0100 Subject: perlgit.pod: update 'git status' sample output --- pod/perlgit.pod | 76 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'pod/perlgit.pod') diff --git a/pod/perlgit.pod b/pod/perlgit.pod index ac24489431..27e5416433 100644 --- a/pod/perlgit.pod +++ b/pod/perlgit.pod @@ -107,24 +107,25 @@ files, and in addition it will show things like what files have been staged for the next commit, and usually some useful information about how to change things. For instance the following: - $ git status - # On branch blead - # Your branch is ahead of 'origin/blead' by 1 commit. - # - # Changes to be committed: - # (use "git reset HEAD ..." to unstage) - # - # modified: pod/perlgit.pod - # - # Changed but not updated: - # (use "git add ..." to update what will be committed) - # - # modified: pod/perlgit.pod - # - # Untracked files: - # (use "git add ..." to include in what will be committed) - # - # deliberate.untracked + % git status + On branch blead + Your branch is ahead of 'origin/blead' by 1 commit. + + Changes to be committed: + (use "git reset HEAD ..." to unstage) + + modified: pod/perlgit.pod + + Changes not staged for commit: + (use "git add ..." to update what will be committed) + (use "git checkout -- ..." to discard changes in working directory) + + modified: pod/perlgit.pod + + Untracked files: + (use "git add ..." to include in what will be committed) + + deliberate.untracked This shows that there were changes to this document staged for commit, and that there were further changes in the working directory not yet @@ -177,12 +178,11 @@ to Orange Brocard, we should change his name in the AUTHORS file: You can see what files are changed: % git status - # On branch orange - # Changes to be committed: - # (use "git reset HEAD ..." to unstage) - # - # modified: AUTHORS - # + On branch orange + Changes to be committed: + (use "git reset HEAD ..." to unstage) + + modified: AUTHORS And you can see the changes: @@ -231,13 +231,12 @@ this: If you re-run C, you should see something like this: % git status - # On branch blead - # Your branch is ahead of 'origin/blead' by 2 commits. - # - # Untracked files: - # (use "git add ..." to include in what will be committed) - # - # deliberate.untracked + On branch orange + Untracked files: + (use "git add ..." to include in what will be committed) + + deliberate.untracked + nothing added to commit but untracked files present (use "git add" to track) When in doubt, before you do anything else, check your status and read @@ -309,13 +308,14 @@ this: If you re-run C, you should see something like this: % git status - # On branch blead - # Your branch is ahead of 'origin/blead' by 2 commits. - # - # Untracked files: - # (use "git add ..." to include in what will be committed) - # - # deliberate.untracked + On branch blead + Your branch is ahead of 'origin/blead' by 2 commits. + (use "git push" to publish your local commits) + Untracked files: + (use "git add ..." to include in what will be committed) + + deliberate.untracked + nothing added to commit but untracked files present (use "git add" to track) When in doubt, before you do anything else, check your status and read -- cgit v1.2.1