already in use may be rejected, causing serious problems with the repository. If you do this, it's a good idea to log off once, for security reasons.MergeMerges the specified branch to the current branch:$ git Merge Branch-nameRevertRevert submitted changes (changes that have been submitted, can be undone ~)Revert the last-commit modification:$ git revert HEADTo revert the modification of the specified version:$ git revert Commit-idStashThe uncommitted changes are staged first, and then all cha
?? original articles, reproduced please specify the Source: Server non-amateur research http://blog.csdn.net/erlib author Sunface Contact e-mail:[email protected] Although I have been working on server-side development for many years, but because of personal interests, for HTML5CSS3 attention to research for a long time, the following will add some of their own collection of dry goods:1.http://html5up.net/A very good foreign HTML5 template website, Sunface portrait recommended! 2.http://sc.china
See http://blog.csdn.net/wyt2013/article/details/18228095 for the latest updates
This article will take the production of "LCD display Cape" as an example to record the process of making beaglebone black cape. It's not done yet, it's a lot more difficult than you think ... But first of all the problems and precautions to be recorded before it ~why to make cape. Cape is the Beaglebone officially referred to as the hardware plug-in peripherals (the completely non-concept of students can go to ht
Filter is the meaning of filtering, its prototype is: $ (filter pattern...,text),Meaning: Filter out all words in the string "TEXT" that do not conform to the pattern, and keep all words that conform to this pattern to return the value.Combined with the front ifneq can be understood in this way: Ifneq (A,), where a=$ (filter AAA BBB CCC, $ (Var))Variable var if the triple-C BBB CCC one or more of the three,
For correction, $ aaabbb is changed to aaabbb 1. for example:
$ Table = Channel
Change
$ Table = Channel
2 for example
$ Row = 10
Change
$ Row = 10
3 for example
$ Table = Channel
Change
Goal:
Refer to the "COMMON/CMD_MMC.C" lookup eMMC code, after the MMC bus initialization function, traverse the MMC bus, find eMMC and
Print EMMC information.
Add our traversal function to the last side of the Mmc_initialize function in
1. Compiling the image for FTP boot
1) uboot
Make Arch=arm Cross_compile=arm-linux-gnueabihf-o=flash-restore AM335X_EVM_RESTORE_FLASH_USBSPL
The generated u-boot.img is copied to the FTP directory under the Flash-restore directory and renamed to
The Projkyaddin is a management Studio plug-in that installs packages of more than 500 KB and is compatible with SSMs 2005, SSMs 2008, SSMs R2, ssms 2012, SSMs 2014, the function is to provide a shortcut to the script file on the hard disk in the
BBB's eMMC Drive in DRIVERS\MMC\CARD\BLOCK.C, its mmc_dirver structure is as follows,
Based on the experience of the previous platform bus driver model, there should be a mmc_devices structure in the kernel, and
Its name is also "MMCBLK" so that its
Ll_rw_block is the file system to access the actual block device-driven interface, the application of the actual file (non-device files) operation, and ultimately are
The Ll_rw_block is invoked through the file system to manipulate the actual
when useful $ git diff [file] # Compare the current file and the staging area file difference $ git diff [$id] [$id] # Compare the differences between two commits $ git diff [Branch1]. [BRANCH2] # Compare $ git diff--staged # between two branches compare staging area and repository diff $ git diff--cached # compare staging Zone and Workspace diff $ git diff--stat # Just compare statistics $ git stash # staging work currently in
Author: gnuhpcSource: http://www.cnblogs.com/gnuhpc/
If you do not use a generic type, the data type is uncertain as follows:
Class stash {Private object X;Void set (Object X ){This. x = X;}Object get (){Return (X );}}Public class stashone {Public static void main (string Arg []) {Stash stash = new stash ();
is resolved, we produce some results through "git log", but this time we will add some parameters to "git log".At the same time, the most recent object diagram is given here.Branch related operationsIn the use of branch, we will often use the Stash and diff operations, respectively, described below.StashIn Git, stash is a useful command that preserves half of our work and can be understood as a saving area
Compression and packaging of documentsOne, gzip and gunzip compressionCommand formatCompression: gzip [options] [filename ... ]Decompression: gunzip [options] [filename ... ]Common Command Options-D: Unzip the compressed file-L: For each compressed document, the following information is displayed: the size of the compressed file, the size of the uncompressed file, the compression ratio, and the name of the uncompressed file-R: Compress or decompress files in each level subdirectory under the spe
When using dom4j, we cannot obtain an element across layers. it must be obtained at one layer, which is very troublesome.
Why xpath?
When using dom4j, we cannot obtain an element across layers. it must be obtained at one layer, which is very troublesome.Therefore, we can use the xpath technology to access a node more conveniently, which allows us to conveniently read the specified node.
Xpath is usually used in combination with dom4j, and if you want to use xpath, you need to introduce a new
.
(%) Bug Branch
Each bug can be repaired by a new temporary branch, after the fix, merge the branch, and then delete the temporary branch.
1.git Stash
Store the current work site, and continue to use it later after replying to the site.
git stash List
View the stash stored in the current branch
。
2.git status
Viewing the workspace at this point in the Dev b
Bug Branch
In software development, bugs are like the norm. With bugs that need to be fixed, in git, because branches are so powerful, each bug can be repaired by a new temporary branch, repaired, merged, and then removed by the temporary branch.When you receive a task to fix a bug with a code number of 101, it is natural that you want to create a branch issue-101 to fix it, but, and so on, the work that is currently in dev progress has not yet been submitted:$ git status# On branch dev# C
, bugs are like the norm. With bugs that need to be fixed, in git, because branches are so powerful, each bug can be repaired by a new temporary branch, repaired, merged, and then removed by the temporary branch.When you receive a task to fix a bug with a code number of 001, it is natural that you want to create a branch bug-001 to fix it, but, and so on, the work that is currently in dev progress has not yet been submitted: $ git Statuson branch devchanges not staged commit: (use " git add
create method. The parameter is the namespace Name (Fully Qualified Name ). This method has a closure environment where a cache variable is used to cache all generated NamespaceObject objects.
A NamespaceObject object contains three attributes: stash (record the current namespace), fqn (namespace name), and proc (createProcedure object ). The methods include enqueue, call, valueof, merge, getStash, and getExport.
The Code is as follows:
74 var Nam
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.