Navigation Menu

Skip to content

Commit

Permalink
properly indent lines in .gitconfig and add subadd command for subm…
Browse files Browse the repository at this point in the history
…odules

Usage: `git subadd path/to/directory/`
  adds a git repo in a subdirectory as a submodule to the project
  (note: always include the trailing slash)
  • Loading branch information
mislav committed Aug 8, 2009
1 parent 8f92509 commit b39428b
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions gitconfig
Expand Up @@ -15,11 +15,12 @@
pending = !git --no-pager log origin/master..master && echo
db = !sh -c 'git branch -D "$0" && git push origin ":$0"' &> /dev/null
missing = !sh -c 'git cherry "$0" | cut -sd + -f 2 | xargs "git show"'
lc = log ORIG_HEAD.. --stat --no-merges
conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR
resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add
lc = log ORIG_HEAD.. --stat --no-merges
conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR
resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add
subadd = !sh -c 'git submodule add $(git config -f"$0".git/config remote.origin.url) "$0"'
[format]
# pretty = format:"%Cblue%ar%Creset\t%s"
# pretty = format:"%Cblue%ar%Creset\t%s"
[color]
diff = auto
status = auto
Expand Down

0 comments on commit b39428b

Please sign in to comment.