git / git-reference Goto Github PK
View Code? Open in Web Editor NEWOnline Git Reference at http://git.github.io/git-reference/
License: Other
Online Git Reference at http://git.github.io/git-reference/
License: Other
So that people can send patches. I could not figure out how you build the site from the templates.
local branch:
`
static int __clk_core_init(struct clk_core *core)
{
int ret;
struct clk_core *parent;
unsigned long rate;
int phase;
if (!core)
return -EINVAL;
clk_prepare_lock();
core->hw->core = core;
ret = clk_pm_runtime_get(core);
if (ret)
goto unlock;
...
}
`
after branch:
`
static int __clk_core_init(struct clk_core *core)
{
int ret;
struct clk_core *parent;
unsigned long rate;
int phase;
if (!core)
return -EINVAL;
clk_prepare_lock();
/*
* Set hw->core after grabbing the prepare_lock to synchronize with
* callers of clk_core_fill_parent_index() where we treat hw->core
* being NULL as the clk not being registered yet. This is crucial so
* that clks aren't parented until their parent is fully registered.
*/
core->hw->core = core;
ret = clk_pm_runtime_get(core);
if (ret)
goto unlock;
...
}
`
local branch:execute "git merge after"
`
static int __clk_core_init(struct clk_core *core)
{
int ret;
struct clk_core *parent;
unsigned long rate;
int phase;
if (!core)
return -EINVAL;
clk_prepare_lock();
core->hw->core = core;
/*
* Set hw->core after grabbing the prepare_lock to synchronize with
* callers of clk_core_fill_parent_index() where we treat hw->core
* being NULL as the clk not being registered yet. This is crucial so
* that clks aren't parented until their parent is fully registered.
*/
core->hw->core = core;
ret = clk_pm_runtime_get(core);
if (ret)
goto unlock;
...
}
`
Result In two occurrences after merge:"core->hw->core = core;", And it happens every time.
ProGit.org content was folded into git-scm.com/book
The description of git stash apply and git stash pop should mention that the stashed changes are merged into the working tree and can result in merge conflicts. It should advise the user how to avoid merge conflicts (by bringing the working tree back to a state where the stash entry applies without conflicts).
layout: reference
{{ content }}
, I think the content such as index.html should be put in this blockBut I don't know how can I use it ? Just put the _layouts/reference.html to index.html by hand?
And all the static files such as css/js ... all use absolute path. And I think it should be relative path if the directory is sub directory
Many thanks for another excellent git resource!
Please add favicon to the site. It just gets lost in the tabs of my browser.
Like github/learn.github.com#52 perhaps we should merge all this site's content into training.github.com too. We may have lost the domain name in #71 but we can save the content and make a commit that empties this repo the same way @jordanmccullough did for learn.github.com and teach.github.com.
{{ content }}
这些标签
I've been giving out git reference cards and wanted a sort of online version of that.
Would you by any chance happen to have a link to such printable cards?
Current situation:
git subtree --help
open up local documents currectly.
While https://git-scm.com/docs/git-subtree
is redirected to https://git-scm.com/docs
Expected:
Amend git subtree's online document.
It'd be useful to add a mention of tag -s and why one might want to use it.
Deleting a remote branch is not done the same as for a local branch :
git push origin :myremotebranchtodelete
It seems that git docs moved somewhere else
http://www.kernel.org/pub/scm/git/
The last sentence of the first paragraph should say "present" instead of "preset"...
"The commands are organized into sections of the type of operation you may be trying to do, and will preset the common options and commands needed to accomplish these common tasks."
In fact, I want to file an issue for the git repository, but in github, I can't file an issue for git (is there no problem with git? lol~~), the problem is: when a project is updated too fast, that is, there are many versions , then the git warehouse will also become very large. This problem is expected to have some trouble for the kernel developers. After all, the first time the warehouse is pulled down, more than one G data will be downloaded. This problem is estimated to be difficult to solve. Of course, most projects will not have this problem, because their version changes will not be so fast, except for kernel and kubernetes, I just want to talk about this problem, that's all
The other day, I tired linking git log -S
, but I couldn't. I had to link git log
. May I add subsection anchors?
<h4>
git log -S
<small>filter by introduced diff</small>
<a name="log-s"></a>
</h4>
Thoughts? Thanks!
Hello. I used to drag and drop folders to Git Bash command line to change the working directory or to create new repos, but this option is no longer available. I'm using Windows 10 64bit - Any clues about this issue? Thank you.
I think that it would be nice to have the left menu visible all the time because one usually skips from one link to another (reads more of them) and for that you have to jump back to the beginning of the page. There is enough unused horizontal space for that.
Take it just as an idea. Otherwise, I like the page and it is helpful even in its current form.
Thank you,
Jan
First of all: I could very well be mistaken.
In the git reset --hard section:
The third option is to go --hard and make your working directory look like the index, unstage files and undo any changes made since the last commit. This is the most dangerous option and not working directory safe. Any changes not in the index or have not been commited will be lost.
As the example after this piece of text shows even changes in the index are lost after a git reset --hard. So this text does not seem to be correct.
Many times, you clone a repo using
git clone git://github.com/certik/jsplot.git
and you'd like to push in using:
git push origin master
you can do that by:
git config remote.origin.pushurl [email protected]:certik/jsplot.git
it'd be cool to have this trick in the remotes section
This repo's description implies that it's powering gitref.org, but that hostname currently redirects to services.github.org. Perhaps the description should be updated with the current canonical home if there is one, or the URL just removed from the description otherwise?
rt
The docs for git reset say:
'git reset HEAD undo the last commit and unstage the files'
git reset HEAD will unstage files, but it will not undo the last commit unless you reset HEAD to HEAD~1 or HEAD^.
the sections for git reset --soft
and git reset --hard
also say the last commit will be undone.
I think this needs to be clarified. Thanks
Hi, is there any chance to translate Git-scm and Git itself to different languages? Thanks!
The correct URL for tagging chapper in the Pro Git book is http://progit.org/book/ch2-10.html. In the current source it links to http://progit.org/book/ch2-6.html
Hi.
In the section http://gitref.org/basic/#rm-mv you are saying that git-rm is equivalent to three commands:
git rm orig
mv orig new
git add new
Although you emphasize it clearly that git rm
removes files from disk, the above example doesn't conform to that. After executing git rm orig
, the orig file will be removed from disk, so there will be nothing to apply the mv
command to. This may lead to some confusion for novice git users. You should probably add --cached
option, like this:
git rm --cached orig
mv orig new
git add new
please add git stash and git revert
'rm' and 'mv' are described in the same section (http://gitref.org/basic/#rm-mv).
In the beginning, 'rm' is explained. Then 'mv'.
And after these, there is this sentence:"In its normal form the command is used to delete files. But it's often easier to just remove the files off your disk and then run git commit -a, which will also automatically remove them from your index.
"
Which gets back to describing 'rm', without mentioning it.
It's quite confusing...
And after it, the 'In a nutshell' section mentions only 'rm', and ignores 'mv'.
This should be introduced before people start making commits with incorrect names and email addresses.
My fault: non-issue
$ git add hello.rb
$ git status -s
M hello.rb
should be
$ git add hello.rb
$ git status -s
A hello.rb
"There isn't a GitHub Page hosted here, sorry." :(
I'm looking for a list of major changes made to git over the years but I can't find any. Even the main repo doesn't seem to have a changelog file or a wiki to refer this. The main reason is that I want to know what major changes have been made since the release of Pro Git book (which is now 4 years old).
If you go forward the tutorial and get to http://gitref.org/basic/ following all the previous steps you will get different results in comparation with the tutorial.
I think that you need to run at least once "git commit" to be able to use these command "git diff HEAD" and "git diff --cached"
See you, thanks.
please tell us how to setup git https auth for client. tired googleing....
At http://gitref.org/basic/#reset the author is talking about the complexity of git reset
and says, "I'll just tell you the three specific invocations of it..." In the reference manual, only git reset HEAD
is used; the remaining two of three invocations are missing.
In the description of the repository the website http://gitref.org is mentioned twice
First sentence:
"Unline centralized version control systems that have a client that is very different from a server ..."
should read "Unlike centralized version control ...", I think.
Ndovrorrir
As a lot of users do switch from svn and need to keep working with svn. Helping them to do it with the git client seems useful.
If this is a wrong statement from a git newbie, I am happy to be told so.
06.DDPGfD.ipynb
On the page: http://gitref.org/remotes/
First line of the heading: git remote, reads "Unline centralized version control systems that have..." Maybe 'unline' should be 'unlike'?
Thank you so much for posting this tutorial. It was extremely useful for me getting "ramped up" on using GIT
So gitref.org/zh is accessible. Thanks for the great reference.
You should mention that git stash
doesn't stash away files that are not in the index yet. It can cause much trouble if you e.g. do a git clean -dfx on the super-urgent-bugfix branch. However, 1.7.7 and up has git stash -u
to do this.
I was cloning my git repository to a new one. One thing I discovered is the ".gitignore" was not included within the new cloned repository.
Should it be copied across as well?
$ curl -v gitref.org
* Adding handle: conn: 0x7fb803004000
* Adding handle: send: 0
* Adding handle: recv: 0
* Curl_addHandleToPipeline: length: 1
* - Conn 0 (0x7fb803004000) send_pipe: 1, recv_pipe: 0
* Could not resolve host: gitref.org
* Closing connection 0
curl: (6) Could not resolve host: gitref.org
and nslookup:
$ nslookup
> gitref.org
;; Got SERVFAIL reply from 10.0.119.1, trying next server
Server: 10.0.119.1
Address: 10.0.119.1#53
** server can't find gitref.org: NXDOMAIN
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google ❤️ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.