)]}' { "commit": "10cdb9f38adaa16aad64403bc931405564523985", "tree": "ecce29c2fb8ca24862f684b6252c4d22b1b41945", "parents": [ "2ac0d6273fa6618e1a8783e07e2363b3abba1f2a" ], "author": { "name": "Elijah Newren", "email": "newren@gmail.com", "time": "Sat Feb 15 21:36:41 2020 +0000" }, "committer": { "name": "Junio C Hamano", "email": "gitster@pobox.com", "time": "Sun Feb 16 15:40:42 2020 -0800" }, "message": "rebase: rename the two primary rebase backends\n\nTwo related changes, with separate rationale for each:\n\nRename the \u0027interactive\u0027 backend to \u0027merge\u0027 because:\n * \u0027interactive\u0027 as a name caused confusion; this backend has been used\n for many kinds of non-interactive rebases, and will probably be used\n in the future for more non-interactive rebases than interactive ones\n given that we are making it the default.\n * \u0027interactive\u0027 is not the underlying strategy; merging is.\n * the directory where state is stored is not called\n .git/rebase-interactive but .git/rebase-merge.\n\nRename the \u0027am\u0027 backend to \u0027apply\u0027 because:\n * Few users are familiar with git-am as a reference point.\n * Related to the above, the name \u0027am\u0027 makes sentences in the\n documentation harder for users to read and comprehend (they may read\n it as the verb from \"I am\"); avoiding this difficult places a large\n burden on anyone writing documentation about this backend to be very\n careful with quoting and sentence structure and often forces\n annoying redundancy to try to avoid such problems.\n * Users stumble over pronunciation (\"am\" as in \"I am a person not a\n backend\" or \"am\" as in \"the first and thirteenth letters in the\n alphabet in order are \"A-M\"); this may drive confusion when one user\n tries to explain to another what they are doing.\n * While \"am\" is the tool driving this backend, the tool driving git-am\n is git-apply, and since we are driving towards lower-level tools\n for the naming of the merge backend we may as well do so here too.\n * The directory where state is stored has never been called\n .git/rebase-am, it was always called .git/rebase-apply.\n\nFor all the reasons listed above:\n * Modify the documentation to refer to the backends with the new names\n * Provide a brief note in the documentation connecting the new names\n to the old names in case users run across the old names anywhere\n (e.g. in old release notes or older versions of the documentation)\n * Change the (new) --am command line flag to --apply\n * Rename some enums, variables, and functions to reinforce the new\n backend names for us as well.\n\nSigned-off-by: Elijah Newren \u003cnewren@gmail.com\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n", "tree_diff": [ { "type": "modify", "old_id": "e6ae30c9999b67d8bbadf03566d768b1bf7c7232", "old_mode": 33188, "old_path": "Documentation/config/rebase.txt", "new_id": "7f7a07d22f86bdfb6b1d12d4625f456b5741bee6", "new_mode": 33188, "new_path": "Documentation/config/rebase.txt" }, { "type": "modify", "old_id": "fbac1cf38dd251299d8dde601bdff1e9548a170f", "old_mode": 33188, "old_path": "Documentation/git-rebase.txt", "new_id": "8c1f4b826809e922d9864eb0ed88daa737f4c217", "new_mode": 33188, "new_path": "Documentation/git-rebase.txt" }, { "type": "modify", "old_id": "db8fd699d79c51dfbfdb6063704619741a47de6d", "old_mode": 33188, "old_path": "builtin/rebase.c", "new_id": "f3036f40c67ca1d6a881752ec64dc5af4020eae0", "new_mode": 33188, "new_path": "builtin/rebase.c" }, { "type": "modify", "old_id": "0a491f23632910ff0547fd96573ae14284dce1c1", "old_mode": 33261, "old_path": "t/t3400-rebase.sh", "new_id": "7c7e085043d6653d1fdcbaebcfee45bdb5982966", "new_mode": 33261, "new_path": "t/t3400-rebase.sh" }, { "type": "modify", "old_id": "50803958fd04deee4ff32716876fee2830f4d943", "old_mode": 33261, "old_path": "t/t3401-rebase-and-am-rename.sh", "new_id": "f18bae94507587a4dc9118cc3d508902e02c6bc1", "new_mode": 33261, "new_path": "t/t3401-rebase-and-am-rename.sh" }, { "type": "modify", "old_id": "f964b2cd41d9a2de7b7abedf1e2bcd1b61426cf4", "old_mode": 33261, "old_path": "t/t3404-rebase-interactive.sh", "new_id": "2f51606e777a6df4f298d53316ce6d2b0c646720", "new_mode": 33261, "new_path": "t/t3404-rebase-interactive.sh" }, { "type": "modify", "old_id": "7ce617fc1fbad41529cebf35a7fe2213a50de8c0", "old_mode": 33261, "old_path": "t/t3406-rebase-message.sh", "new_id": "61b76f3301982d26b808044bde9ce928f663112e", "new_mode": 33261, "new_path": "t/t3406-rebase-message.sh" }, { "type": "modify", "old_id": "3e31826170390d871adecb7b4aa1797a1e893f73", "old_mode": 33261, "old_path": "t/t3407-rebase-abort.sh", "new_id": "97efea0f569714792e82ae7c66a796d6f44ee3be", "new_mode": 33261, "new_path": "t/t3407-rebase-abort.sh" }, { "type": "modify", "old_id": "3816159e2079ad34ea5883ef2f813912f6a518b2", "old_mode": 33261, "old_path": "t/t3420-rebase-autostash.sh", "new_id": "b97ea623639486000a2ca26da253775add02356a", "new_mode": 33261, "new_path": "t/t3420-rebase-autostash.sh" }, { "type": "modify", "old_id": "e12304012a2d5ff06dc8993a2abc4c62c0d9daf6", "old_mode": 33261, "old_path": "t/t3421-rebase-topology-linear.sh", "new_id": "cf8dfd6c203b30b0da4339b099cf6cabcbee04a9", "new_mode": 33261, "new_path": "t/t3421-rebase-topology-linear.sh" }, { "type": "modify", "old_id": "cfb1ebc1ff93190db3600c3f37747a922f467a84", "old_mode": 33261, "old_path": "t/t3424-rebase-empty.sh", "new_id": "98fc2a558a03f8276d34f99fadc630440f764b1e", "new_mode": 33261, "new_path": "t/t3424-rebase-empty.sh" }, { "type": "modify", "old_id": "19700b025b511efd8d8ad3e4f04ad9d3d38756ef", "old_mode": 33261, "old_path": "t/t3425-rebase-topology-merges.sh", "new_id": "e42faa44e74f1abe247aa1c16da9d5582123d42c", "new_mode": 33261, "new_path": "t/t3425-rebase-topology-merges.sh" }, { "type": "modify", "old_id": "4b3cecce560edee5dece7793e3a1fbde66603fcc", "old_mode": 33261, "old_path": "t/t3432-rebase-fast-forward.sh", "new_id": "6c9d4a13758194dfcf4b005e36f8358ed5a27f80", "new_mode": 33261, "new_path": "t/t3432-rebase-fast-forward.sh" }, { "type": "modify", "old_id": "a8a73616e46cc693798fab235d2d232026148589", "old_mode": 33261, "old_path": "t/t5407-post-rewrite-hook.sh", "new_id": "80750a817e950848f11f334615c2a03b42afe286", "new_mode": 33261, "new_path": "t/t5407-post-rewrite-hook.sh" }, { "type": "modify", "old_id": "4f9e7f7ff6b022beb233766453f59a4ca29adc85", "old_mode": 33261, "old_path": "t/t5520-pull.sh", "new_id": "2f86fca0428cde001e2e6b3735e215714037059d", "new_mode": 33261, "new_path": "t/t5520-pull.sh" }, { "type": "modify", "old_id": "d383ce813029cc7ac18ecbf6ca7ebc679625a617", "old_mode": 33261, "old_path": "t/t6047-diff3-conflict-markers.sh", "new_id": "f4655bb358ff7fa5c10427d49423fa5eb6849ab8", "new_mode": 33261, "new_path": "t/t6047-diff3-conflict-markers.sh" }, { "type": "modify", "old_id": "d22b0acf2aca650efc2edcc768fdca0cfaa4ef83", "old_mode": 33261, "old_path": "t/t7512-status-help.sh", "new_id": "29518e0949bfc83582c882c67c54bb56f1f0698a", "new_mode": 33261, "new_path": "t/t7512-status-help.sh" }, { "type": "modify", "old_id": "7ca35d358d65c6bf7cc09c91b9644ac77b5d6586", "old_mode": 33261, "old_path": "t/t9903-bash-prompt.sh", "new_id": "ab5da2cabc400a7a3102bd962a60a08629f4d535", "new_mode": 33261, "new_path": "t/t9903-bash-prompt.sh" } ] }