{"push_id":616073020,"size":14,"distinct_size":5,"ref":"refs/heads/next","head":"1f270f9dfd62a48f8f5983ec672c972d7307effa","before":"1e1e5fdfb345c0ff9265604de8d64ca01d55f26a","commits":[{"sha":"c9e1f2c7f2acca17c629255b96761a4a1047a28a","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"diff-no-index: DWIM \"diff D F\" into \"diff D/F F\"\n\n\"git diff --no-index\" was supposed to be a poor-man's approach to\nallow using Git diff goodies outside of a Git repository, without\nhaving to patch mainstream diff implementations.\n\nUnlike a POSIX diff that treats \"diff D F\" (or \"diff F D\") as a\nrequest to compare D/F and F (or F and D/F) when D is a directory\nand F is a file, however, we did not accept such a command line and\ninstead barfed with \"file/directory conflict\".\n\nImitate what POSIX diff does and append the basename of the file\nafter the name of the directory before comparing.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/PKRoma/git/commits/c9e1f2c7f2acca17c629255b96761a4a1047a28a"},{"sha":"fddfaf8a229710c50aeaacf6e40429965348493e","author":{"email":"9b628111aab41d580e151622bf2807b46b6284d5@cisco.com","name":"Phil Hord"},"message":"git-push.txt: clean up force-with-lease wording\n\nThe help text for the --force-with-lease option to git-push\ndoes not parse cleanly.  Clean up the wording and syntax to\nbe more sensible.  Also remove redundant information in the\n\"--force-with-lease alone\" description.\n\nSigned-off-by: Phil Hord <hordp@cisco.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/PKRoma/git/commits/fddfaf8a229710c50aeaacf6e40429965348493e"},{"sha":"129260cbd42f2a9fb40055ac6ed32c7b75a5ec05","author":{"email":"77397652b38ec60b50e56236b813774ce842bcdf@gmail.com","name":"Sebastian Schuberth"},"message":"docs: clarify \"preserve\" option wording for git-pull\n\nThe \"also\" sounds as if \"preserve\" does a rebase as an additional\nstep that \"true\" would not do, but that is not the case.  Clarify\nthis by omitting \"also\", and rewording the sentence a bit.\n\nSigned-off-by: Sebastian Schuberth <sschuberth@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/PKRoma/git/commits/129260cbd42f2a9fb40055ac6ed32c7b75a5ec05"},{"sha":"06151739988601b0fe6179c6c67a0031b85b536f","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"diff-no-index: align D/F handling with that of normal Git\n\nWhen a commit changes a path P that used to be a file to a directory\nand creates a new path P/X in it, \"git show\" would say that file P\nwas removed and file P/X was created for such a commit.\n\nHowever, if we compare two directories, D1 and D2, where D1 has a\nfile D1/P in it and D2 has a directory D2/P under which there is a\nfile D2/P/X, and ask \"git diff --no-index D1 D2\" to show their\ndifferences, we simply get a refusal \"file/directory conflict\".\n\nSurely, that may be what GNU diff does, but we can do better and it\nis easy to do so.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":true,"url":"https://api.github.com/repos/PKRoma/git/commits/06151739988601b0fe6179c6c67a0031b85b536f"},{"sha":"90329592b93629d2d43996950ced71cff07626e8","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Update mailmap to spell out \"Alexander Kuleshov\"\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/PKRoma/git/commits/90329592b93629d2d43996950ced71cff07626e8"},{"sha":"792c57273f5ccc318c93d32112548fbd033f5964","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint\n\nThe code that reads from the ctags file in the completion script\n(in contrib/) did not spell ${param/pattern/string} substitution\ncorrectly, which happened to work with bash but not with zsh.\n\n* js/completion-ctags-pattern-substitution-fix:\n  contrib/completion: escape the forward slash in __git_match_ctag","distinct":false,"url":"https://api.github.com/repos/PKRoma/git/commits/792c57273f5ccc318c93d32112548fbd033f5964"},{"sha":"a730ea3c3aa8d09cd69d114ea4160049d9a4fd04","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/smart-http-hide-refs' into maint\n\nThe transfer.hiderefs support did not quite work for smart-http\ntransport.\n\n* jk/smart-http-hide-refs:\n  upload-pack: do not check NULL return of lookup_unknown_object\n  upload-pack: fix transfer.hiderefs over smart-http","distinct":false,"url":"https://api.github.com/repos/PKRoma/git/commits/a730ea3c3aa8d09cd69d114ea4160049d9a4fd04"},{"sha":"d8279c7d85f82edea8c86e4e7c2fbd787ae09735","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jk/tag-h-column-is-a-listing-option' into maint\n\n\"git tag -h\" used to show the \"--column\" and \"--sort\" options\nthat are about listing in a wrong section.\n\n* jk/tag-h-column-is-a-listing-option:\n  tag: fix some mis-organized options in \"-h\" listing","distinct":false,"url":"https://api.github.com/repos/PKRoma/git/commits/d8279c7d85f82edea8c86e4e7c2fbd787ae09735"},{"sha":"553c622b685f0a7a83c77617377f08019d76c682","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'sb/leaks'\n\n* sb/leaks:\n  http: release the memory of a http pack request as well\n  read-cache: fix memleak\n  add_to_index(): free unused cache-entry\n  commit.c: fix a memory leak\n  http-push: remove unneeded cleanup\n  merge-recursive: fix memleaks\n  merge-blobs.c: fix a memleak\n  builtin/apply.c: fix a memleak\n  update-index: fix a memleak\n  read-cache: free cache entry in add_to_index in case of early return","distinct":false,"url":"https://api.github.com/repos/PKRoma/git/commits/553c622b685f0a7a83c77617377f08019d76c682"},{"sha":"283cd320db9057163b2e7434ac481ff8e785671f","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Sync with maint\n\n* maint:\n  Update mailmap to spell out \"Alexander Kuleshov\"","distinct":false,"url":"https://api.github.com/repos/PKRoma/git/commits/283cd320db9057163b2e7434ac481ff8e785671f"},{"sha":"79633d08fd69356b8a8e515e650e02bfe68dca45","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ss/pull-rebase-preserve' into next\n\n* ss/pull-rebase-preserve:\n  docs: clarify \"preserve\" option wording for git-pull","distinct":true,"url":"https://api.github.com/repos/PKRoma/git/commits/79633d08fd69356b8a8e515e650e02bfe68dca45"},{"sha":"0737697f9c788dd87f52b261fd6a6a250e295129","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'ph/push-doc-cas' into next\n\n* ph/push-doc-cas:\n  git-push.txt: clean up force-with-lease wording","distinct":true,"url":"https://api.github.com/repos/PKRoma/git/commits/0737697f9c788dd87f52b261fd6a6a250e295129"},{"sha":"37ccc3255b24a3679d9a47f39ef49f6ddbb01061","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Sync with master\n\n* master:\n  Update mailmap to spell out \"Alexander Kuleshov\"","distinct":true,"url":"https://api.github.com/repos/PKRoma/git/commits/37ccc3255b24a3679d9a47f39ef49f6ddbb01061"},{"sha":"1f270f9dfd62a48f8f5983ec672c972d7307effa","author":{"email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com","name":"Junio C Hamano"},"message":"Merge branch 'jc/diff-no-index-d-f' into next\n\nThe usual \"git diff\" when seeing a file turning into a directory\nshowed a patchset to remove the file and create all files in the\ndirectory, but \"git diff --no-index\" simply refused to work.  Also,\nwhen asked to compare a file and a directory, imitate POSIX \"diff\"\nand compare the file with the file with the same name in the\ndirectory, instead of refusing to run.\n\n* jc/diff-no-index-d-f:\n  diff-no-index: align D/F handling with that of normal Git\n  diff-no-index: DWIM \"diff D F\" into \"diff D/F F\"","distinct":true,"url":"https://api.github.com/repos/PKRoma/git/commits/1f270f9dfd62a48f8f5983ec672c972d7307effa"}]}