This is an important assumption.

The way I understand it, cherry picking is intended to be used in case of unanticipated migration of code.

The patch branch should start at a common ancestor of all the target branches. Since the broken code is in all the target branches, it must be in at least one of their common ancestors.

If we don't start from a common ancestor and merge the patch into all the target branches, at least one of the target branches will get some extra change along with the patch.

it's cleaner to use rebase to bring your outdated feature branch up to speed with develop, rather than merging develop into your feature branch.

git log & blame

显示指定文件相关的每一次diff

显示效果如下，但会显示高亮：

commit 32e0c4f6bbb91617126b1cf2ab8c403ce7691ffe
Author: lishuailong <lishuailong@baidu.com>
Date:   Tue Jul 11 15:14:59 2017 +0800

    delete by loc

diff --git a/bin/server_control b/bin/server_control
index 6d81daa..4cf5106 100755
--- a/bin/server_control
+++ b/bin/server_control
@@ -48,7 +48,7 @@ function cleanup() {
 function realtime_cleanup() {
     mkdir -p ../realtime_delete/data
     DATE_TO_CLEANUP=`date +"%Y%m%d" -d "-7 days"`
-    cat ../data/*${DATE_TO_CLEANUP}*.succ | $PYTHON_BIN delete_succ.py 2> ../log/realtime_cleanup.log
+    cat ../data/*${DATE_TO_CLEANUP}*.succ | $PYTHON_BIN delete.py --format json 2> ../log/realtime_cleanup.log
     rm -f ../data/*${DATE_TO_CLEANUP}*
 }


commit 47a2565e033dc1ed60a0ffd4df5e760dbcaebad8
Author: lishuailong <lishuailong@baidu.com>
Date:   Thu Jul 6 16:18:47 2017 +0800

    fix realtime cleanup

diff --git a/bin/server_control b/bin/server_control
index 13b756f..6d81daa 100755
--- a/bin/server_control
+++ b/bin/server_control
@@ -48,7 +48,7 @@ function cleanup() {
 function realtime_cleanup() {
     mkdir -p ../realtime_delete/data
     DATE_TO_CLEANUP=`date +"%Y%m%d" -d "-7 days"`
-    cat ../data/*${DATE_TO_CLEANUP}.succ | $PYTHON_BIN delete_succ.py 2> ../log/realtime_cleanup.log
+    cat ../data/*${DATE_TO_CLEANUP}*.succ | $PYTHON_BIN delete_succ.py 2> ../log/realtime_cleanup.log
     rm -f ../data/*${DATE_TO_CLEANUP}*
 }

When the development of a feature takes a long time, it may be useful to continuously merge from develop into the feature branch. This has the following advantages:

• We can use the new features introduced in develop in the feature branch.
• We simplify the integration merge of the feature branch into develop that will happen at a later point.

@jankrag & @randomsort (slides, demo-repo)

Principles which are supported by hooks presented here

• never commit on master
• always reference an issue in commit message (via GitHub API)
• #serverless, #noOps & delivery through ready-branches
• hook manager: overcommit (via)

attributes + drivers to improve diff

• hexdump binaries
• convert .docx to .md
• line-wrap paragraphs
• metadata of images or audio
• ASCI-ize image
• xls2csv, unzip

filter drivers (process BLObs on save or checkout)

• enforce lint-/formatting
• Caesar's obfuscation

also: @_flexbox's sketch notes

Raw Git, Dissecting Git's Guts, & Pro Git (slides)

repo, BFG & LFS; also @_flexbox's sketch notes

• git clone https://github.com/hectorsector/git-and-the-bad-day.git
• git lol = alias git log --oneline plus which other options?
• git diff with .. vs ...? one is against merge base
• when pushed credentials, change them before filtering, contacting support to clear caches, or other due diligence
• ohshitgit.com

also: @_flexbox's sketch notes

with @kylemacey, see @_flexbox's sketch notes

renamed to: Greatest Hits from the Ask-Git-Core

• .gitignore vs .git/info/exclude = tracked in repo vs. local config
• submitgit.herokuapp.com & imerge

also: @_flexbox's sketch notes

Nice intro of git submodule

After a recent power outage, a call to 'git status' returned this:

fatal: Not a git repository (or any of the parent directories): .git

When I inspected .git/HEAD, it was filled with what looked like binary code, rather than a string like:

ref: refs/heads/master

or

ref: refs/heads/develop

This:

echo 'ref: refs/heads/develop' > ./git/HEAD

did the trick!

I use etckeeper on my Arch Linux boxen, to great joy

Issues can be reported at: https://github.com/hypothesis/h/issues

Getting started with Git

Git gets this basic division of worlds right and is a fundamental departure from other version control systems like SVN. The feature that enables all this is nearly cost-free, instantaneous branching.

What makes this new world complex is not due to git, but instead because the world is, quite simply, complex! Good tools like git help us manage (some of) the complexity.

Good defaults are sometimes hard to recognize, especially when the tool is complex.

Questioning the defaults-- and deciding why you would keep them or change them-- is a good antidote to dismissing something due to not understanding it.

If you can't understand why you don't like the defaults, then decide what you would choose instead and why you would change the default as it stands. Does the default make it easy to do the "right" thing AND hard to do the "wrong" thing? The second part of that statement is the most important since it might not be obvious what the "right" thing is.

Even if you don't like the defaults, ask yourself if they continually lead you away from perils and problems that would plague you if a different set of defaults were chosen?