Is it possible to git-checkout a single line instead of the entire file?
If I have modified several lines of a versioned file, is it possible to undo the changes of a line by command-line?
Just like I would do for an entire file with:
git checkout /path/to/file.extension
but doing something like, say
git checkout /path/to/file.extension --line 10
is this possible?
You can use git checkout -p to see each hunk individually and decide whether to check them out or leave them as is (and that takes an optional path argument as well if you'd like to narrow it down further).
To elaborate on Matt's answer, git checkout --patch -- <path argument> starts an interactive mode with the following options:
y - stage this hunk
n - do not stage this hunk
q - quit; do not stage this hunk or any of the remaining ones
a - stage this hunk and all later hunks in the file
d - do not stage this hunk or any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
e - manually edit the current hunk
? - print help
The y n s and e options are a good place to start.
See also:
https://git-scm.com/docs/git-checkout for --patch
https://git-scm.com/docs/git-add for the interactive options.
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- How to remove local (untracked) files from the current Git working tree
- What is the difference between 'git pull' and 'git fetch'?
- Undo working copy modifications of one file in Git?
- How do I find and restore a deleted file in a Git repository?
- How do I make Git forget about a file that was tracked, but is now in .gitignore?
- How do I remove a single file from the staging area (undo git add)?
- Move the most recent commit(s) to a new branch with Git
- How can I git stash a specific file?
- How do I fix a Git detached head?
