https
GET
api.github.com
None
/gists/3800341
{'Authorization': 'Basic login_and_password_removed', 'User-Agent': 'PyGithub/Python'}
null
200
[('status', '200 OK'), ('x-ratelimit-remaining', '4990'), ('x-github-media-type', 'github.beta; format=json'), ('x-content-type-options', 'nosniff'), ('vary', 'Accept, Authorization, Cookie'), ('content-length', '4270'), ('server', 'nginx'), ('last-modified', 'Fri, 21 Dec 2012 18:46:45 GMT'), ('connection', 'keep-alive'), ('x-ratelimit-limit', '5000'), ('etag', '"446137bf216c4edc30567fbc3e944b5a"'), ('cache-control', 'private, s-maxage=60, max-age=60'), ('date', 'Fri, 21 Dec 2012 20:30:39 GMT'), ('content-type', 'application/json; charset=utf-8')]
{"created_at":"2012-09-28T14:50:53Z","commits_url":"https://api.github.com/gists/3800341/commits","html_url":"https://gist.github.com/3800341","public":true,"url":"https://api.github.com/gists/3800341","forks":[],"description":"\"Temporary merge branch\" in `git mergetool`","forks_url":"https://api.github.com/gists/3800341/forks","history":[{"change_status":{"deletions":0,"additions":81,"total":81},"committed_at":"2012-09-28T14:50:53Z","url":"https://api.github.com/gists/3800341/98f3e3709dd8aa7d93c38a0ee9392e5a8d97ebfd","version":"98f3e3709dd8aa7d93c38a0ee9392e5a8d97ebfd","user":{"type":"User","gists_url":"https://api.github.com/users/jacquev6/gists{/gist_id}","gravatar_id":"b68de5ae38616c296fa345d2b9df2225","avatar_url":"https://secure.gravatar.com/avatar/b68de5ae38616c296fa345d2b9df2225?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png","subscriptions_url":"https://api.github.com/users/jacquev6/subscriptions","login":"jacquev6","starred_url":"https://api.github.com/users/jacquev6/starred{/owner}{/repo}","repos_url":"https://api.github.com/users/jacquev6/repos","url":"https://api.github.com/users/jacquev6","events_url":"https://api.github.com/users/jacquev6/events{/privacy}","followers_url":"https://api.github.com/users/jacquev6/followers","following_url":"https://api.github.com/users/jacquev6/following","received_events_url":"https://api.github.com/users/jacquev6/received_events","organizations_url":"https://api.github.com/users/jacquev6/orgs","id":327146}}],"user":{"type":"User","gists_url":"https://api.github.com/users/jacquev6/gists{/gist_id}","gravatar_id":"b68de5ae38616c296fa345d2b9df2225","avatar_url":"https://secure.gravatar.com/avatar/b68de5ae38616c296fa345d2b9df2225?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png","subscriptions_url":"https://api.github.com/users/jacquev6/subscriptions","login":"jacquev6","starred_url":"https://api.github.com/users/jacquev6/starred{/owner}{/repo}","repos_url":"https://api.github.com/users/jacquev6/repos","url":"https://api.github.com/users/jacquev6","events_url":"https://api.github.com/users/jacquev6/events{/privacy}","followers_url":"https://api.github.com/users/jacquev6/followers","following_url":"https://api.github.com/users/jacquev6/following","received_events_url":"https://api.github.com/users/jacquev6/received_events","organizations_url":"https://api.github.com/users/jacquev6/orgs","id":327146},"git_pull_url":"https://gist.github.com/3800341.git","updated_at":"2012-09-28T14:50:53Z","id":"3800341","comments_url":"https://api.github.com/gists/3800341/comments","comments":0,"files":{"temporary_merge_branch.sh":{"content":"#!/bin/sh\n\nfunction hack() {\n    echo \"Hack $1\" >> file.txt\n    git add file.txt\n    git commit -m \"Hacked '$1'\"\n}\n\nfunction resolve() {\n    grep Hack file.txt > file2.txt\n    mv file2.txt file.txt\n    git add file.txt\n    git commit -F .git/MERGE_MSG\n}\n\nrm -rf WorkingDirectory\nmkdir WorkingDirectory\ncd WorkingDirectory\n\n# Create the following branches:\n#\n#                 O <- b11\n#               /\n#             O\n#           /   \\\n#         /       O <- b12\n#  O----O\n#         \\       O <- b21\n#           \\   /\n#             O \n#               \\\n#                 O <- b22\n\ngit init\n\nhack Init\n\ngit branch b1\ngit branch b2\n\ngit checkout b1\nhack b1\n\ngit branch b11\ngit branch b12\n\ngit checkout b11\nhack b11\n\ngit checkout b12\nhack b12\n\ngit checkout b2\nhack b2\n\ngit branch b21\ngit branch b22\n\ngit checkout b21\nhack b21\n\ngit checkout b22\nhack b22\n\ngit branch -D b1 b2\n\n# Then merge b11 and b21 together\ngit checkout b11 -b bX1\ngit merge b21\nresolve\n\n# And b12 and b22 together\ngit checkout b12 -b bX2\ngit merge b22\nresolve\n\n# This gives several merge bases for bX1 and bX2\ngit merge-base --all bX1 bX2\ngit merge bX1\n# And a \"Temporary merge branch\" in file.txt.BASE when launching the mergetool\ngit mergetool\n","type":"application/sh","filename":"temporary_merge_branch.sh","size":1213,"raw_url":"https://gist.github.com/raw/3800341/4b8da5ba61e17f01f836de2992f3a7a5d2c461b1/temporary_merge_branch.sh","language":"Shell"}},"git_push_url":"https://gist.github.com/3800341.git"}

