author | Junio C Hamano <gitster@pobox.com> | |
Sat, 22 Aug 2009 01:47:53 +0000 (18:47 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 22 Aug 2009 01:47:53 +0000 (18:47 -0700) | ||
commit | f00ecbe42b82f3c8e6a170074f2299487026e400 | |
tree | fca98c6ac1d4cde3d5e60d296b2fcae8caf7fc6b | tree | snapshot |
parent | 5e092b5bcea48c098af7000f888a2a0f16c9db77 | commit | diff |
parent | 4e65b538acc97dd853e19a1692893f5fd47043e6 | commit | diff |
Merge branch 'cc/replace'
* cc/replace:
t6050: check pushing something based on a replaced commit
Documentation: add documentation for "git replace"
Add git-replace to .gitignore
builtin-replace: use "usage_msg_opt" to give better error messages
parse-options: add new function "usage_msg_opt"
builtin-replace: teach "git replace" to actually replace
Add new "git replace" command
environment: add global variable to disable replacement
mktag: call "check_sha1_signature" with the replacement sha1
replace_object: add a test case
object: call "check_sha1_signature" with the replacement sha1
sha1_file: add a "read_sha1_file_repl" function
replace_object: add mechanism to replace objects found in "refs/replace/"
refs: add a "for_each_replace_ref" function
* cc/replace:
t6050: check pushing something based on a replaced commit
Documentation: add documentation for "git replace"
Add git-replace to .gitignore
builtin-replace: use "usage_msg_opt" to give better error messages
parse-options: add new function "usage_msg_opt"
builtin-replace: teach "git replace" to actually replace
Add new "git replace" command
environment: add global variable to disable replacement
mktag: call "check_sha1_signature" with the replacement sha1
replace_object: add a test case
object: call "check_sha1_signature" with the replacement sha1
sha1_file: add a "read_sha1_file_repl" function
replace_object: add mechanism to replace objects found in "refs/replace/"
refs: add a "for_each_replace_ref" function
15 files changed:
Makefile | diff1 | | diff2 | | blob | history |
builtin-fsck.c | diff1 | | diff2 | | blob | history |
builtin-pack-objects.c | diff1 | | diff2 | | blob | history |
builtin-unpack-objects.c | diff1 | | diff2 | | blob | history |
builtin.h | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
commit.h | diff1 | | diff2 | | blob | history |
environment.c | diff1 | | diff2 | | blob | history |
git.c | diff1 | | diff2 | | blob | history |
mktag.c | diff1 | | diff2 | | blob | history |
parse-options.c | diff1 | | diff2 | | blob | history |
parse-options.h | diff1 | | diff2 | | blob | history |
refs.c | diff1 | | diff2 | | blob | history |
sha1_file.c | diff1 | | diff2 | | blob | history |
upload-pack.c | diff1 | | diff2 | | blob | history |