some new scripts which are useful to me + whitespace cleanups #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
it finds the closest match from all (or a limited amount) of the reachable trees to a specified tree (where tree is referenced by it's checksum) very useful to process the results of `git fsck --unreachable | cut -d\ -f3`
…ything which is not in at one of the defined remotes
…irectory is (if any)
The user selects which ignore rules (gitignore files, excludes, ...) using dmenu
$GIT_DIR is used for the actual .git dir, not the root of the repository. So pick a better variablename
…op level more elegantly
…ht be unique content
The previous approach where you `git push --all -n $remote 2>&1` and check whether the result is 'Everything up-to-date' can (and often will) yield "To prevent you from losing history, non-fast-forward updates were rejected" Since such an approach does traffic with the remote anyway, I choose to fetch the origin and inspect it's branches. This is a bit inefficient network-wise, but couldn't see a better solution
this script allows "merging branches", but uses the interactive rebase feature to allow you to (de)select (and modify) commits before merging taken from http://stackoverflow.com/questions/449541/how-do-you-merge-selective-files-with-git-merge written by '1800 INFORMATION' (minor edits by me)
jwiegley
added a commit
that referenced
this pull request
Sep 24, 2011
some new scripts which are useful to me + whitespace cleanups
javabrett
pushed a commit
to javabrett/git-scripts
that referenced
this pull request
May 31, 2016
Tuxdude
added a commit
to Tuxdude/git-scripts
that referenced
this pull request
Aug 15, 2016
* jwiegley-git-scripts/master: Add Symbolic Link for git-fire Squashed 'git-fire-subtree/' content from commit 99fc11b ln -s git-branch-status-subtree/git-branch-status git-branch-status refactor fix bug that stripped underscores from branch name (fixes jwiegley#2) add GPL3 and README add --remotes switch to show all remotes add -v --verbose switch fix IFS split on (behind n)/(ahead n) add --dates entry to usage factor all messages out of display loop into parsing loop add HEAD timestamps add indicators for current branch and no upstream swap ahead<->behind display to behind<->ahead supress OK msg when "fatal: Not a git repository" minor fixes restrict max column width format into colums - add filters - add usage message format into colums - add filters - add usage message (DEBUG_VERSION) add ANSI colors Adds a status-line if everything is synchronized initial commit - print commits ahead<->behind counts Add git-standup Make command work when in the non-root directory of a repo, or from the top-level of a bare repo. Show contribution from all authors Added support for non-empty git-svn prefix, important now that the default --prefix is "origin/" in Git 2.0+. Added git-discover-large-blobs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.