Differences

This shows you the differences between two versions of the page.

--- notes:git [2023/08/30 11:46] – created - external edit 127.0.0.1
+++ notes:git [2024/02/28 09:54] (current) – [Create/Apply Patches] azman
@@ Line 1: / Line 1: @@
 ====== Git Stuff ======
-From [[http://git-scm.com|here]],
+From [[https://git-scm.com|here]],
 //"Git is an open source, distributed version control system  designed to handle everything from small to very large projects with speed and efficiency."//
-Some useful configurations before starting with git. I have this simple script that I run on a new machine I want to work on.
+Some useful configurations before starting with git. I have this [[https://codeberg.org/azman/my1shell/src/branch/master/gitstart|simple script]] that I run on a new machine I want to work on.
-<file bash gitstart>
-#!/bin/bash
-# gitstart
-# - written by azman@my1matrix.net
-# - write basic git config setup
-GIT_NAME=${GIT_NAME:="Azman M. Yusof"}
-GIT_MAIL=${GIT_MAIL:="azman@my1matrix.net"}
-git config --global user.name "$GIT_NAME"
-git config --global user.email "$GIT_MAIL"
-git config --global color.diff auto
-git config --global color.status auto
-git config --global color.branch auto
-git config --global color.ui auto
-if [ -f /etc/slackware-version ]; then
-	# only on slackware? some viewing problems (less environment?)
-	git config --global core.pager "less -FXRS"
-fi
-</file>
-Note: Set the environment variable //VISUAL// to your favorite console editor... I use $(which vim). OR, use <code>$ git config --global core.editor "vim"</code>
 ===== Create, Clone, Add, Commit =====
@@ Line 49: / Line 26: @@
 Create formatted patches (note: sha1id1..sha1id2 is the range of commits used to create patches) <code>$ git format-patch -o /path/to/patches/ sha1id1..sha1id2</code>
 To rename created patch(es) with commit timestamp <code> for a in *.patch ; do l=$(cat $a|grep 'Date: ') ; d=$(date +"%Y%m%d%H%M%S" -d "${l#*: }") ; mv $a "$d${a:4}" ; done</code>
-To apply the patches (stopping on error) <code>for a in ~/temp/patch/*.patch ; do git am <$a ; [ $? ne 0 ] && break; done</code>
+To apply the patches (stopping on error) <code>for a in ~/temp/patches/*.patch ; do git am <$a ; [ $? -ne 0 ] && break; done</code>
 ===== Branching/Merging =====
 Create new local branch <code>$ git branch <local-branch></code>
-Delete local branch (-D to force) <code>$ git branch -d <local-branch></code>
+Remove local branch (-D to force) <code>$ git branch -d <local-branch></code>
 Create a local branch to track remote branch <code>$ git checkout --track -b <local-branch> <remote-branch></code>
 Set current local branch to track a remote branch <code>$ git branch -u <remote>/<branch></code>
@@ Line 153: / Line 130: @@
 <code>git reset HEAD@{1}</code>
-Delete remote branch
+Remove remote branch
 <code>git push origin --delete {branch}</code>
-If the remote branch has been deleted, use this to delete local reference
+If the remote branch has been removed, use this to remove local reference
 <code>git remote update origin --prune</code>