Nice log option in ezk.git with all commits and branches

Author: nschlimm

EasyKey.git/ezk-git-atln.sh

@@ -37,11 +37,15 @@ cherryPick() {
    [ "${cbranch}" = "" ] && waitonexit && return 
    git checkout $cbranch
    git cherry-pick $cname
-   echo -n "Cherry picked $cname. Add files to stage(y/n)?" && wait_for_keypress
+   echo -n "Cherry picked $cname. Add files to stage(y/n)?" && wait_for_keypress && echo
    [ "${REPLY}" != "y" ] && waitonexit && return 
    git add .
-   git cherry-pick --continue
-   echo -n "Push changes(y/n)?" && wait_for_keypress
+   if [ -f .git/CHERRY_PICK_HEAD ]; then
+     git cherry-pick --continue
+   else
+     echo "No cherry-pick in progress"
+   fi
+   echo -n "Push changes(y/n)?" && wait_for_keypress && echo
    [ "${REPLY}" != "y" ] && waitonexit && return 
    git push origin $cbranch
 }

EasyKey.git/git.sh

@@ -16,9 +16,10 @@ menuInit "EasyKey.git"
     menuItemClm e "Set upstream to current" setUpstream f "Administer remotes" adminRemotes
   submenuHead "Working on local branches "
     menuItemClm r "Show branch history" showBranchHisto g "Show reflog" showRepoHisto
+    menuItemClm l "Show all commits log" "git log --all --graph --decorate --oneline" p "Show all branches (incl. remote)" showAllBranches
     menuItemClm v "Checkout remote branch" coRemoteBranch n "Delete local/remote branch" deleteBranch
-    menuItemClm o "Merge source to target branch" mergeSourceToTarget p "Show all branches (incl. remote)" showAllBranches
     menuItemClm k "New local/remote branch checkout" newLocalBranch c "Change commit messages" ammendCommit 
+    menuItem o "Merge source to target branch" mergeSourceToTarget 
   submenuHead "Other usefull actions "
     menuItemClm s "Working with diffs" workingDiffs w "Working with commits" atlassiansView
     menuItemClm y "Setting up repositories" settingUp 5 "Git extras" gitExtras