Currently Browsing: GIT

Get build ID from Git repo

git log --pretty=oneline | wc -l

GitHub-Pivotal Tracker commit format

Easy integration to change status on Pivotal Tracker when using GitHub. After sync’ing the services via API key, you can use the format:

[Delivers #12345679]

verbs include:
started, fixed, completed, finished, delivered.

see: https://www.pivotaltracker.com/help/api?version=v5

The minimum commit message string that will allow Tracker to associate a /source_commits POST with a story and create a comment is a single story ID enclosed in square brackets: ‘[#12345678]‘. A more typical message, indicating that one commit completes two stories (which need not be in the same Tracker project), might look like this: ‘finally [finished #12345678 #12345779], fixes client/server integration glitch’

If an included story was not already started (it was in the “not started” state), an update to that story from /source_commits that doesn’t contain any other state-change information will automatically start the story.

To automatically finish a story by using a commit message, include “fixed”, “completed”, or “finished” in the square brackets in addition to the story ID. You may use different cases or forms of these verbs, such as “Fix” or “FIXES”, and they may appear before or after the story ID.

Git: show files just merged

git log -m --name-only

Git Tip: How to “Merge” Specific Files from Another Branch

Git Tip: How to “Merge” Specific Files from Another Branch

basically:
git checkout source_branch <paths>...

then commit.

also look into adding –patch or –merge to checkout:
http://git-scm.com/docs/git-checkout