the submission information for the new commit. This process essentially overrides your commit history.
LweiTranslated 8 months ago1 Person topTop translation of good Oh!
8. Stash UNCOMMITTED changesYou are modifying a bug or feature and are suddenly asked to show your work. And the work you're doing is not enough to submit, and you won't be able to show it at this stage (before you go back to the change). In this case, git
line shows the merged graph,---git log--graph--pretty=oneline--abbrev-commit-An abbreviated submission ID number on one line Git stash-The main use for this branch of the reserved storage, wait until the debugging bug succeeds, then restore the original branch to continue the next workgit stash List-used to view the display of listing information for paused hold storagegit
, if the workspace has been modified without committing, you need to commit or stash
git checkout branch--force//Toggle Branch While resetting buffers and workspaces
git checkout--force//Do not specify branch, used to clear the workspace changes (the buffer is unchanged, if there was an add, then the workspace is consistent with the buffer zone)
git reset HEAD fileName//Can undo staging area's changes (unstage)
RM test.txt//File Manager Delete files
file, you need to add a backslash "\" to escape.
4.git of Staging Area
Git's content for staging area is maintained in the . Git/index file.
Local branch and merge of 5.git
git branch: Create a branch. (Typically, a branch name, such as Master Branch Master, will typically point to the most recent commit of that branch)
git tag: Tag a specific hit, and query the tag you created. (There are two types of tag: 1. Lightweight Local:git tag "TagName" Commitno , 2. W
Tags: type find search form CTO perm end operator Output InuxxargsRead data from standard input (stdin) for processing
Data is separated by a space
Can be processed one or more times according to the parameters, the default processing command is/bin/echo
Empty lines are not processed and are ignored
When a command status of 255 is encountered, Xargs stops immediately, such as when an error occurs.
Let's take a look at the xargs parameters to choose from.2.options
-A
two commits modified the same line of the same file, and git does not know which one to apply. This causes the error message to resemble the following:
Git will give you 3 choices to fix the commit that caused the conflict (fa39187):
You can run git rebase--abort to completely de-base the variable. Doing so cancels the change-base modification and resets the branch back to the state it was before executing git rebase.
You can run git rebase--skip to completely ignore the commit. In this way, t
Chinese name, the following is displayed:
The stash Command uses the scene, as you are modifying the code on a branch a, but there is an urgent task that requires you to switch to another branch B to do some work, and the code on a is still a dabbler, Do not want to go to commit or even do not want to add, this time the Stash command is of great use, if no commit is executed
git
and you have not been asked to change it again until the next review. You've got some extra commits before you know it's going to change again. Ideally, you can compress multiple commits into one using the rebase command.?
1
gitrebase-iHEAD~[number_of_commits]
If you want to compress the last two commits, you need to run the following command.?
1
gitrebase-iHEAD~2
When
working directory tree.
20. Git cleanGit clean removes files without track from the working directory. the common parameter is GIT clean-DF:-D, indicating that the directory is removed at the same time, and-F indicates force, because in the GIT configuration file, clean. requireforce = true. If-F is not added, clean will reject execution.
21. Git mvGit Rm--cached orig; MV orig new; git add new
22. Git stashPress the current change into a stack. git stash
Git end
6, at this point to view git log results found that there is only one operation record, that is, we added the a.txt of the record, we did the second step of the operation. That is, when we add the b.txt file node, how do we fall back to the last node?We can use Git reflog
7, now the demo folder in the 2 file contentsThe a.txt text reads as follows:
Initializing content
The b.txt text reads as follows:
This is B text content
We continue to add the following record information for B.txt
Today, I am reading mobile messaging technologies and services, which describes the naming principles of 3GPP documents. I translated it into Chinese and sorted it out as a small document for reference. For more precise descriptions, see mobile messaging technologies and services.
3GPP specification: naming schemeEach 3GPP technical document, Technical Report (TR) or technical specification (TR) is uniquely identified by a reference. This reference starts with the 3GPP prefix and is followed b
Today, I am reading mobile messaging technologies and services, which describes the naming principles of 3GPP documents. I translated it into Chinese and sorted it out as a small document for reference. For more precise descriptions, see mobile messaging technologies and services.
3GPP specification: naming schemeEach 3GPP technical document, Technical Report (TR) or technical specification (TR) is uniquely identified by a reference. This reference starts with the 3GPP prefix and is followed b
;setkeywords ("Office 2007 OPENXML PHP")//Set tag->setcategory ("Test result file"); Set category//Position AAA * Add data to table for the following code location $objPHPExcel->setactivesheetindex (0)//Set the first built-in table (an XLS Can have more than one table in a piece) for activity->setcellvalue (' A1 ', ' Hello ')//sets the data for the table's cells->setcellvalue (' B2 ', ' world! ') The data format can be string->setcellvalue (' C1 ', 12)//Digital->setcellvalue (' D2 ',
, when merging branches, if possible, Git uses fast forward mode, but in this mode, the branch information is discarded after the branch is deleted. If you want to force the fast forward mode to be disabled, GIT will generate a new commit at merge, so you can see the branching information from the branch history. ) 20. Delete Branch $ git branch-d de v Forcibly delete a branch: $ git branch-d dev 21. View Branch consolidation $ git Log--graph--pretty=oneline--abbrev-com
called, realloc () allocates a new block).The second parameter is the new length of the block, assuming the length is smaller than the original, the block will not need to be copied. Simply tell the heap manager that the rest of the space is spare. Assuming the length is larger than the original, there is not enough space in the heap. So you want to allocate new blocks and copy the memory. ASSERT () Check to make sure that the operation was successful.(Assuming that the heap is exhausted, mallo
Tstringlist class is a pair of the most factory used in Delphi, we look at the detailed usage of tstringlist here together.
Let's start by listing several properties to be discussed:1, CommaText2, Delimiter Delimitedtext3, Names Values Valuefromindex
Tstrings is an abstract class that, in actual development, is the most applied except for the basic type.
Tstringlist Common Methods and properties:
Var
List:tstringlist;
I:integer;
Begin
List: = tstringlist.create;
List.add (' Strings1 '); Add
BranchesGit branchGit branch-aMerges the specified branch to the current branchgit merge DevDisable Fast forward when merging branches to preserve branch information and create new commitsGit merge--no-ff-m "merge with No-ff" DevDelete Branchgit branch-d DevForcibly deleting a branch that is not merged will lose the modificationGit branch-d feature1To view the branch consolidation situationgit log--graph--pretty=oneline--abbrev-commitSave the scene so you can do other things first, you can save
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.