aboutsummaryrefslogtreecommitdiffstats
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-08-04 10:52:31 -0700
committerJunio C Hamano <gitster@pobox.com>2023-08-04 10:52:31 -0700
commit65e25ae52298e9f1a8c7d94fd0ddffaf30cd944e (patch)
tree9cda3a2b3cec16652c2de790ca2ec431e13c42a2 /commit.c
parentMerge branch 'hy/blame-in-bare-with-contents' (diff)
parentbranch: update the message to refuse touching a branch in-use (diff)
downloadgit-65e25ae52298e9f1a8c7d94fd0ddffaf30cd944e.tar.gz
git-65e25ae52298e9f1a8c7d94fd0ddffaf30cd944e.zip
Merge branch 'jc/branch-in-use-error-message'
"git branch -f X" to repoint the branch X said that X was "checked out" in another worktree, even when branch X was not and instead being bisected or rebased. The message was reworded to say the branch was "in use". * jc/branch-in-use-error-message: branch: update the message to refuse touching a branch in-use
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions
-D in man-page.Andreas Ericsson1-4/+11 2005-11-14Depend on asciidoc 7 (at least).Matthias Urlichs1-1/+1 2005-11-14Remove git-rename. git-mv does the sameJosef Weidendorfer5-107/+1 2005-11-14Bugfix: stop if directory already existsJosef Weidendorfer1-2/+2 2005-11-14Separate LDFLAGS and CFLAGS.Junio C Hamano1-9/+20 2005-11-14Remove trailing slashesMatthias Urlichs1-1/+6 2005-11-13Rename lost+found to lost-found.Junio C Hamano5-7/+7 2005-11-13Fix compilation warnings in pack-redundant.cKai Ruemmler1-7/+8 2005-11-13Debian: build-depend on libexpat-dev.Junio C Hamano2-1/+7 2005-11-13Split gitk into seperate RPM packageThomas Matysik1-3/+17 2005-11-13Add expat and expat-devel dependencies (for http-push) to RPM spec.Thomas Matysik1-2/+2 2005-11-12Fix fd leak in http-fetchNick Hengeveld1-0/+2 2005-11-12Fix for multiple alternates requests in http-fetchNick Hengeveld1-61/+117 2005-11-12debian packaging: git-cvs needs cvspsMatthias Urlichs1-1/+1 2005-11-11Ignore built git-lost+found.Junio C Hamano1-0/+1 2005-11-11Documentation: asciidoc sources are utf-8Junio C Hamano2-3/+3 2005-11-11Rename .git/lost+found to .git/lost-found.Junio C Hamano2-5/+5 2005-11-11git-lost+foundJunio C Hamano4-1/+106 2005-11-11git-prune: prune redundant packsJunio C Hamano1-0/+11 2005-11-11Make git-pack-redundant consider alt-odbsLukas_Sandström3-62/+106 2005-11-11Rename git-pack-intersect to git-pack-redundantLukas_Sandström5-11/+13 2005-11-11Make git-repack use git-pack-intersect.Lukas_Sandström1-18/+12 2005-11-11Add git-pack-intersect to .gitignoreLukas_Sandström1-0/+1