display the log for a particular branch.
Git log-p master: Origin/mastergit log--oneline branch1 ^branch2, you can view the commit in branch 1, but not in branch 2. ^ means exclude this branch ( ^BRANCH2 may be quoted under window). git log--decorate will display the tag information . git log--author=[author name] You can specify the author's commit history.
added to the commit cache, that is, it is not ready to commit (commit).View Modified Content
Although Git status tells us that File1.txt has been modified, but does not tell us where it was modified, use the following command in order to see exactly where the file has been modified:
git diff file
The git
After studying vim for some time, it was not until recently that Vim's diff function was so convenient that it was no longer necessary to look for diff software or to rely on version-controlled diff in contrast to code changes. Powerful vim.Is my diff effect in the Macvim.The following is a common use of Vimdiff, summe
$ git reset--hard head~3 # Modify Repository, modify staging area, modify workspace $ git commit--amend # Modify last commit record $ git reve RT [$id] # restores the state of a commit, the recovery action itself also creates a commit object $ git revert HEAD # restores the last committed stat
The diff command compares a given two files in the simplest case. If you use "-" instead of the "file" parameter, the content to be compared will come from standard input. The diff command compares the similarities and differences of text files in a row-by-line manner. If the command specifies a comparison of the directory, the file with the same file name in the directory will be compared without any compa
state of the last commit, discarding all of the changes since the previous commit
Git ci
Git ci.
Git ci-a # git add, git rm and git ci are all combined together
git ci-am "
Git notes sorting and git sorting
1. Install Git
1. Install git. Click Git Bash to go to the command line window.2. Configuration:$ Git config -- global user. name "Your Name"$ Git conf
In Unix systems, you can use many methods to maintain the source code version. Of course, the most common method is the well-known CVs, but in fact, simple version maintenance does not need to use complex CVs and other specialized version maintenance tools. The diff and patch tools in the UNIX standard can completely back up and upgrade the code.
Diff compares two text files (or directory comparison) in t
to working file
git Reset--hard # Restores the state of the last commit, discarding all of the changes since the previous commit
Git ci
Git ci.
Git ci-a # git add, git rm and git
The most magical part of react is the virtual DOM, and its efficient diff algorithm. This allows us to "refresh" the entire page at any time without worrying about performance issues and "without scruple", by the virtual DOM to ensure that the actual DOM operation is performed only on the truly changing parts of the interface. React is transparent enough in this section, and in real-world development we don't have to worry about how virtual DOM works.
Step 1 of manual configuration: Configure. vimrc
Objective: vimdiff can automatically wrap a long line of information in wrap.
" ~/.vimrc"BEGIN for vimdifffunc Wrap() set wrapendfuncmap
Step 2: Configure ~ /. Subversion/config
Purpose: Replace the default SVN diff comparison tool with a custom script. If it is uncomfortable, change it back.
### Set diff-cmd to the absolute path of your '
, the Git status display is relatively simple, just list the modified files, if you want to see where the specific changes, you can use the git diff command. We'll cover git diff in more detail later, but now it can answer two of our questions: What updates are currently not
summarize, the advantages and disadvantages of SVN are as follows:
Advantage:
Code consistency is high.
Supports the submission of things.
Diff feature.
Branch,tag, convenient version management.
Easy to get started.
Disadvantage
It must be networked in order to read some data.
is not a distributed code base.
The disaster of the SVN server crash is huge.
GitWith t
1. Command format:diff[parameter [file 1 or directory 1][file 2 or directory 2]2. Command function:The diff command can compare individual files or directory contents. If you specify that the comparison is a file, it is only valid if the input is a text file. Compare the similarities and differences of text files in a row-by-line manner. If you specify a table of contents, the diff command compares a text f
1. Git add is an easy-to-query command. The SVN add action in Subversion is to add a file to version control, and git add has a completely different meaning.At the same time, Git diff--cached is the difference between the files in the stage and a non-intuitive command.GitHub's 2008 blog, also mentioned, is prone to con
fix, and a specialized new function, merge merge after stabilization
Git branch bug_fix # create branch named bug_fix
Git checkout bug_fix # Switch to bug_fix
Git checkout master # Switch to the primary Repo
Git merge bug_fix # merge the bug_fix branch with the current Branch
# If you have a remote branch, y
I. OverviewDiff and Patch are a pair of complementary tools, mathematically, diff is similar to the difference between two sets, and patches are similar to the and operations on two sets. Diff compares the differences of two files or collections of files and logs them down to generate a diff file, which is also what we often call patch files, which are patches. P
Although there are many graphical interface diff tools, but for the command-line plot of people, when the fast terminal under the keyboard, always do not want to take the mouse to click elsewhere, and sometimes the graphical interface occupies a lot of resources, my MBA often started diffmerge when stuck, But Vimdiff can only compare a set of files in a single label, and if you want to compare the diff of f
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.