Skip to content

Appendix Final #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ben merged 27 commits into from
Oct 21, 2014
Merged

Appendix Final #89

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d44c85e
add small section on git difftool
schacon Oct 8, 2014
e8224cb
log, stash and tag
schacon Oct 9, 2014
4a33d46
plumbing section and flesh out the rest of the commands
schacon Oct 9, 2014
0c0da3e
manual remerge link
schacon Oct 9, 2014
2671a49
fetch and pull
schacon Oct 9, 2014
e86fc25
Embedding: intro edits
ben Oct 13, 2014
beccdc4
JGit: setup and plumbing
ben Oct 13, 2014
652bccb
forgot to add these xlinks
schacon Oct 13, 2014
2fb691d
push, remote and submodule
schacon Oct 13, 2014
0cce6a4
inspection and comparison
schacon Oct 13, 2014
a5033d3
debug and started on patching
schacon Oct 13, 2014
ea4fa23
rebase
schacon Oct 13, 2014
e65216b
revert
schacon Oct 13, 2014
8215864
am, format-patch, send-email and request-pull
schacon Oct 13, 2014
38a302d
svn, import
schacon Oct 13, 2014
c460106
rest of the commands
schacon Oct 13, 2014
57eb252
add git to the subsections
schacon Oct 13, 2014
96ba7db
Merge remote-tracking branch 'origin/master' into appendix-final
schacon Oct 13, 2014
45cc896
Porcelain
ben Oct 14, 2014
a923fcf
Further reading
ben Oct 17, 2014
f66e5d5
Tweaks
ben Oct 17, 2014
645ea37
Expand Libgit2 content
ben Oct 19, 2014
25b2ad0
Extended Rugged example
ben Oct 19, 2014
87a3648
ODB backends part I
ben Oct 20, 2014
659ef40
Feedback
ben Oct 20, 2014
d9db713
More custom ODB backend content
ben Oct 21, 2014
d3e1176
Libgit2 tweaks
ben Oct 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rebase
  • Loading branch information
@schacon
schacon committed Oct 13, 2014
commit ea4fa232c9d9abdc4f774cf33053257f25022fbb
1 change: 1 addition & 0 deletions book/05-distributed-git/sections/maintaining.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ When a topic branch has finally been merged into `master`, it's removed from the
The Git project also has a `maint` branch that is forked off from the last release to provide backported patches in case a maintenance release is required.
Thus, when you clone the Git repository, you have four branches that you can check out to evaluate the project in different stages of development, depending on how cutting edge you want to be or how you want to contribute; and the maintainer has a structured workflow to help them vet new contributions.

[[_rebase_cherry_pick]]
===== Rebasing and Cherry Picking Workflows

(((workflows, rebasing and cherry-picking)))
Expand Down
1 change: 1 addition & 0 deletions book/07-git-tools/sections/replace.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[[_replace]]
=== Replace

Git's objects are unchangable, but it does provide an interesting way to pretend to replace objects in it's database with other objects.
Expand Down
14 changes: 14 additions & 0 deletions book/C-git-commands/1-git-commands.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,22 @@ A few commands in Git are centered around the concept of thinking of commits in

==== cherry-pick

The `git cherry-pick` command is used to take the change introduced in a single Git commit and try to re-introduce it as a new commit on the branch you're currently on. This can be useful to only take one or two commits from a branch individually rather than merging in the branch which takes all the changes.

Cherry picking is described and demonstrated in <<_rebase_cherry_pick>>.

==== rebase

The `git rebase` command is basically an automated `cherry-pick`. It determines a series of commits and then cherry-picks them one by one in the same order somewhere else.

Rebasing is covered in detail in <<_rebasing>>, including covering the collaborative issues involved with rebasing branches that are already public.

We use it in practice during an example of splitting your history into two seperate repositories in <<_replace>>, using the `--onto` flag as well.

We go through running into a merge conflict during rebasing in <<_rerere>>.

We also use it in an interactive scripting mode with the `-i` option in <<_changing_multiple>>.

==== revert


Expand Down