Skip to content

Instantly share code, notes, and snippets.

@jordanst3wart
Last active September 27, 2023 09:35
Show Gist options
  • Select an option

  • Save jordanst3wart/f07d78217f18d0d70b91bfb349964224 to your computer and use it in GitHub Desktop.

Select an option

Save jordanst3wart/f07d78217f18d0d70b91bfb349964224 to your computer and use it in GitHub Desktop.

Revisions

  1. jordanst3wart revised this gist Sep 27, 2023. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion .gitconfig
    Original file line number Diff line number Diff line change
    @@ -4,7 +4,7 @@

    [alias]
    squash = "!f(){ git reset --soft $(git merge-base master $(git branch --show-current)) && git commit -m \"${1}\";};f"
    update = "git checkout master && git pull && git checkout $(git branch --show-current) && git rebase"
    update = "!f(){ git checkout master && git pull && git checkout $(git branch --show-current) && git rebase;};f"
    [push]
    autoSetupRemote = true
    [pull]
  2. jordanst3wart revised this gist Sep 27, 2023. No changes.
  3. jordanst3wart revised this gist Sep 27, 2023. No changes.
  4. jordanst3wart revised this gist Sep 27, 2023. 1 changed file with 2 additions and 2 deletions.
    4 changes: 2 additions & 2 deletions .gitconfig
    Original file line number Diff line number Diff line change
    @@ -1,6 +1,6 @@
    [user]
    name = Jordan Stewart
    email = jordan@propcode.com.au
    name = fill me
    email = fill@example.com

    [alias]
    squash = "!f(){ git reset --soft $(git merge-base master $(git branch --show-current)) && git commit -m \"${1}\";};f"
  5. jordanst3wart revised this gist Sep 27, 2023. 1 changed file with 4 additions and 1 deletion.
    5 changes: 4 additions & 1 deletion .gitconfig
    Original file line number Diff line number Diff line change
    @@ -4,5 +4,8 @@

    [alias]
    squash = "!f(){ git reset --soft $(git merge-base master $(git branch --show-current)) && git commit -m \"${1}\";};f"
    update = "git checkout master && git pull && git checkout $(git branch --show-current) && git rebase"
    [push]
    autoSetupRemote = true
    autoSetupRemote = true
    [pull]
    rebase = true
  6. jordanst3wart revised this gist Jul 18, 2023. 1 changed file with 4 additions and 3 deletions.
    7 changes: 4 additions & 3 deletions .gitconfig
    Original file line number Diff line number Diff line change
    @@ -1,7 +1,8 @@
    # This is Git's per-user configuration file.
    [user]
    name = Jordan Stewart
    email = redacted
    email = jordan@propcode.com.au

    [alias]
    squash = "!f(){ git reset --soft $(git merge-base master $(git branch --show-current)) && git commit -m \"${1}\";};f"
    squash = "!f(){ git reset --soft $(git merge-base master $(git branch --show-current)) && git commit -m \"${1}\";};f"
    [push]
    autoSetupRemote = true
  7. jordanst3wart created this gist Jul 18, 2023.
    7 changes: 7 additions & 0 deletions .gitconfig
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,7 @@
    # This is Git's per-user configuration file.
    [user]
    name = Jordan Stewart
    email = redacted

    [alias]
    squash = "!f(){ git reset --soft $(git merge-base master $(git branch --show-current)) && git commit -m \"${1}\";};f"