TE
TechEcho
Home24h TopNewestBestAskShowJobs
GitHubTwitter
Home

TechEcho

A tech news platform built with Next.js, providing global tech news and discussions.

GitHubTwitter

Home

HomeNewestBestAskShowJobs

Resources

HackerNews APIOriginal HackerNewsNext.js

© 2025 TechEcho. All rights reserved.

Git and GitHub Secrets [video]

56 pointsby dpearsonover 12 years ago

4 comments

prolepunkover 12 years ago
The the talk goes on about GitHub and then Git, so the title could be structured a little better; I don't use github as much as I use git, so here's the link to the second part of the talk -- <a href="http://www.youtube.com/watch?feature=player_detailpage&#38;v=Foz9yvMkvlA#t=1570s" rel="nofollow">http://www.youtube.com/watch?feature=player_detailpage&#38;v...</a><p>There's quite of few intricate git parameters I didn't know about, so here's my notes for almost all of them:<p><pre><code> git add -p [ a logical way of staging hunks ( diff entities) ] git checkout - [ '$ cd -' for branches ] git branch --merge [ show all merged branches ] git branch --no-merge [ not merged branches ] git branch --contains [ which branch contains a particular sha ] git checkout BRANCH -- path/to/file [ copy a file from a different branch ] git log branchA ^branchB [ show commits in a that not in b] git fsck --lost-found [ show deleted content that hasn't been gc'd] git diff HEAD --stat [ force display commit message ] git blame -w [ shows who changed each line while ignoring whitespace changes ] git blame -M [ ignore move commits, display only code changes ] git blame -C/-CC/-CCC [ ignore different levels of move/rename and only display code block creation or modification commits ] git config remotes.mygroup 'remote1 remote2' [ group multiple remotes ] git status -sb [ colorize status, remove fluff ] git diff HEAD^ --word-diff [ colorize and highlight word changes instead of producing line diffs ] git config --global help.autocorrect 1 [ convert 'did you mean' messages into action, questionable usefulness ] git config --global rerere.enabled 1 [ remember previously merged commits when merging repeatedly with same branches, i.e. master -&#62; long running dev branch ] git config --global color.ui 1 [ command that I keep googling on stack overflow whenever I setup git on a new machine ] git commit --amend [ modify commits that haven't been pushed to remote ] git reset --soft HEAD^ [ retains commit diff as 'staged' as opposed to complete erase with --hard ] git shortlog -sn [ count number of line diffs by author? committer? ] git commit (--amend) --author "Author Name &#60;author@email&#62;" [ attribute commit ] </code></pre> A minor nitpick about the talk, is that the speaker tries to humor everyone and most of the time it falls flat, I mean calling everyone who can setup SSH keypair neckbeards? It's a little more cringeworthy than funny, and thanks to moments like this the attitude of the presenter comes off as a bit presumptuous.
评论 #4711712 未加载
评论 #4711356 未加载
AdamGibbinsover 12 years ago
<a href="http://zachholman.com/talk/git-github-secrets" rel="nofollow">http://zachholman.com/talk/git-github-secrets</a>
btianover 12 years ago
this is probably unrelated but can anyone explain why the size of the 1080p video is so much larger than the 720p one? (1920x1080) / (1280x720) = 2.25 while 1.6 x 1024 / 237.3 = 6.9
评论 #4710819 未加载
hayksaakianover 12 years ago
Is this link bait or actually worth reading?