you'll see a message
Like this:
Automatic cherry-pick failed. After resolving the conflicts,Mark the corrected paths with 'git add When commiting, use the option '-C 94e310d' to retain authorship and message.
This is fairly self-explanatory. Use "Git status" to see which filesAre problematic:
Edit the file to manually resolve the conflict, add the
Sometimes when compared to the code, see some changes, but not clear the author and reason for the change, do not know the corresponding bug number, that is, there is no way to find out the specific reasons for these changes ~"Note": A file changes are limited, and each time the code changes submitted will have a commit description, we can start from here;One, switch to the directoryFirst switch to the directory where you want to view the files:CD pac
Reference: Http://stackoverflow.com/questions/1786027/how-to-view-file-history-in-gitUse git log to view the commit history. Each commit have an associated revision specifier a hash key (e.g. 14b8d0982044b0c49f7a855e396206ee65c0e787 and b41 0ad4619d296f9d37f0db3d0ff5b9066838b39). To view the difference between and diff
In the early days of learning git, we met a common problem and wanted to see the history of a file's modification. Here is to give you a detailed explanation of the steps. How to view a file's modification history: The first step is to find a file with a history of changes t
1. Git log-p filenameView a detailed history of the file changes, if there is no-p option, only show the commit record, do not display the file content modification, git log-p-3 filename shows the last 3 commits.2. Git log--pretty
/packages/apps/vargoservice/src/CN/COM/Vargo/cloudservice/contacts $ git show 13338d571a4743f8830081c911b4aebbb6680b89
Commit 13338d571a4743f8830081c911b4aebbb6680b89
Author:
Date: Wed Mar 12 18:29:20 2014 + 0800
Added the synchronization interface for Data Query
Diff -- git a/androidmanifest. xml B/androidmanifest. xml
Index bdebb94.. d90312e 100644
--- A/androidmanifest. xml
++ B/androidmanifest. xml
: Git status View changes to files in the local workspace, registers
For the use of Git diff and git add commands, please refer to the article: Git Usage manual: Git diff, git Add, git
First, see who wrote the line of code, and in which commit:git blame file_namegit blame-l 58,100 Keyboardactivity.javaIts display format is:Commit ID | Code Submission Author | Submission Time | Number of lines in the file that the code is in | Actual codeThis is similar to the following:650) this.width=650; "src=" Http://s5.51cto.com/wyfs02/M02/8C/24/wKioL1hjeVeyc1XSAAIDgRtPpIE882.png "style=" width : 600px;height:476px; "title=" Qq20161228163503.png
(the latest code inside the remote git server, overwriting the local code); Newfile.text was deleted.
--click Reset to perform mode 2: (any commit record for the current branch)
Project right--team--show in history--Select commit record right mouse button--reset
Effect same Way 1
Soft, Mixed operation will make head record change (head represents the record of the current workspace pointing to commit)
Hard
in history. The topology option is enabled for the same command:
$ Git log -- oneline -- graph * 88afe0e Merge branch 'change _ site' | \ | * d7e7346 changed the site * | add a new line to 14b4dca |/* 556f0a0 removed test2.txt * 2e082b7 add test2. * 048598f add test.txt * 85fc7e7 test comment from runoob.com
Now, we can see more clearly when to work and when to merge.
You can also use the -- reverse parame
View git history
Git log [branch]/[commit hash]/[tag]Displays a summary of Historical submission information for a branch, commit, or tag.
Git log a .. BDisplay historical information in a-B Evolution
Add the parameter-P to view the detailed modification information.
Git
Git learning notes-view git History 1. view Git logs: 2. specified search range: 3. view the differences between specified versions. 4. undo modify 4.1 Add modify (can only be used for the last commit) 4.2 reverse commit 4.3 reset 5 re-rewrite history 1. view
Code, and Use-p option to see the codeFilter by the code using Regex:// Using ' G ' without quotes and follow with regex math or randomIngore the case:git log-i--author="Jane"// search both for "Jane" and "Jane"-- author="Jane"// search only for "Jane"Filter out Merges commit:git log--no-mergesSee the commits between-branch:git log master. Cool-featureSearch by files:// Search for Lience and Readme filesExample:Git log-3 readme.md-p-i--author="tavor"// want to sees last 3 change o n readme.md
the previous commit into a single commit, and the merged submission uses the author information of the previous submission
F (Fixup): Compresses the current commit and the previous commit into a single commit and discards the current commit information, using the previous commit information
X (EXEC): a command statement that needs to be executed when the commit is processed
4. Git filter-branchThis command can modify all commits to the r
if, at present, we are in the demand branch feature-test, made several mentions, git log view commit information as follows:
Each commit is independent, but the last three commits are related, adding the contents of the Read.txt file, in this article, as an example to explain how to modify, merge, fallback commit. View git
Version: Git rev-parse--GIT-DIR Displays the location of the Git repository--show-cdup displays the depth of the current workspace directory--parseopt parsing command-line arguments$ git rev-parse--symbolic--branches display Branch$ git rev-parse--symbolic--tags show milesto
I don't know if there's anything to clean up. A directory history file needs to be cleaned. There will probably be a lot of other places to clean up the history files, which may be used.
I spent the past two days writing a script, cleaning more convenient, there will be a large number of historical documents to clean up the words can be used.
The commands used i
Let's split our changes into separate commits. We ' ll be able to check over our changes before staging them all from the terminal. Then, we'll see the positive effect it have on our commit history.git add--patch1. Then in the cmd, we can type ' s ' stands for splite the changes into chunks.2. Then type ' Q ' stands for quite.3. ADD commit message for the part of changes4. Then run git add--patch5. Repeact 1-4 until all changes is included[
The introduction of git is not much said. Here is just a simple entry-level operation.
This section focuses on operations related to viewing and controlling historical versions.Everything is simple, not reasonable, but simple operations.Original article, if reproduced, please indicate the source: http://blog.csdn.net/yihui823/article/details/6681214
With Copper as the mirror, you can wear the crown;
Taking history
The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion;
products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the
content of the page makes you feel confusing, please write us an email, we will handle the problem
within 5 days after receiving your email.
If you find any instances of plagiarism from the community, please send an email to:
info-contact@alibabacloud.com
and provide relevant evidence. A staff member will contact you within 5 working days.