| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Some code is restructured to remove the need for this additional
entry-point.
Signed-off-by: Malfurious <m@lfurio.us>
|
|
This commit removes the differences between the supported shells and
removes the options: --bash, --fish, and --zsh.
I can not produce any problems in any of these shells using a generic
form of the text coloring (ie: the one bash was using), so for
simplicity I will opt to unify the way colors are handled and remove
knowledge of the running shell.
Something that _may_ end up being a problem is properly rendering the
prompt in different terminal emulators. If this is of concern, it will
be dealt with at a later time.
Signed-off-by: Malfurious <m@lfurio.us>
|
|
Signed-off-by: Malfurious <m@lfurio.us>
|
|
Signed-off-by: Malfurious <m@lfurio.us>
|
|
Signed-off-by: Malfurious <m@lfurio.us>
|
|
Signed-off-by: Malfurious <m@lfurio.us>
|
|
|
|
Signed-off-by: Malfurious <m@lfurio.us>
|
|
Signed-off-by: Malfurious <m@lfurio.us>
|
|
If the user's git is configured with 'pull.ff = only', these lines would
fail since the two repositories have diverged from each other. '--ff'
is added to restore the original default of allowing either a
fast-forward or recursive merge to take place. In reality, an implicit
3-way merge is being performed. All tests now pass.
Signed-off-by: Malfurious <m@lfurio.us>
|
|
Merge pending pull request #67 of upstream git-radar project from user
cbandera. They write:
This is a pull request to fix issue #38. As it turns out, some built in
commands behave differently on Mac OS X and Linux.
In order to run the tests on Linux, I have added switch statements at
some points to call the functions with the respective syntax.
Also I realized, that the tests only worked for me when I set the
following options:
git config --global push.default simple
git config --global branch.autosetuprebase never
But that's probably just because these should be the defaults. I
normally have them set to something else...
|
|
https://github.com/rholmboe/git-radar
Merge pending pull request #107 of upstream git-radar project from user
rholmboe. Note I did manually resolve a fairly trivial conflict in the
is_cwd_a_dot_git_directory() function. From the original PR:
Bug #98 wasn't really propagated correctly, you still got git-fetch bug
when you entered a sub-directory in .git. Now it's recursive, faster and
still POSIX compliant.
|
|
Merge pending pull request #111 of upstream git-radar project from user
hallzy. They write:
I came across "typechanged" the other day in my git status. It occurs
when (for example) you change a file from being a regular file, to a
symlink.
Not sure if you want this in. I am using "TC" in the terminal to show
this.
I would also like a check on the grep's in the lines that I added. I
understand that everything inside of the square brackets can be matched,
but I am unsure what letters I would also need with this.
|
|
Merge pending pull request #119 of upstream git-radar project from
user m007. They write:
This commit allows the user to define a per repository or per branch
specific configuration of which branch git-radar compares the current
branch to. If no branch is configured explicitly "origin/master" will
be used (being backwards compatible with the current behaviour).
A branch specific remote tracking branch may be configured by executing
git config --local branch."$(git rev-parse --abbrev-ref HEAD)".git-radar-tracked-remote origin/my-branch-to-compare-to
A repository specific remote tracking may be configured by executing
git config --local git-radar.tracked-remote origin/my-branch-to-compare-to
A branch specific setting will overwrite a repository specific
configuration (which will overwrite the default, i.e origin/master).
|
|
https://github.com/michaeldfallen/git-radar
|
|
This commit allows the user to define a per repository or per branch
specific configuration of which branch git-radar compares the current
branch to. If no branch is configured explicitly "origin/master" will
be used (being backwards compatible with the current behaviour).
A branch specific remote tracking branch may be configured by executing
git config --local branch."$(git rev-parse --abbrev-ref HEAD)".git-radar-tracked-remote origin/my-branch-to-compare-to
A repository specific remote tracking may be configured by executing
git config --local git-radar.tracked-remote origin/my-branch-to-compare-to
A branch specific setting will overwrite a repository specific
configuration (which will overwrite the default, i.e origin/master).
|
|
|
|
|
|
|
|
Add lightweight version to README
|
|
|
|
includes using POSIX native commands and going away from basename/dirname
|
|
|
|
|
|
Resolve issue #98 - Git stash error when entering .git Directory
|
|
radar-base.sh now checks to see if the current directory is a .git
directory. If it is, it skips the git stash part.
|
|
Remove the '\n' that put the cursor on a new line (prompt on 2 lines instead of one)
|
|
of one)
|
|
Fix for bad characters showing in the stash status in OS X
|
|
|
|
|
|
Redirect Branch Lookup Error Output
|
|
closes #88
closes #86
|
|
|
|
|
|
Added feature that let's you specify how often to fetch
|
|
Hallzy #70
|
|
|
|
|
|
Feature/ditch awk
|
|
Escape all forward slashes
|
|
substitution that has been removed in this commit.
|
|
|
|
|
|
Set the variable GIT_RADAR_FETCH_TIME in a bashrc, zshrc or gitradarrc file to
customize the fetch time.
|
|
Conflicts:
radar-base.sh
|
|
|
|
Turns out it had a bug when the branch name had a slash in it.
|
|
in fetch.sh "if" now checks for $@ instead of just $1
in radar-base.sh there is now a parameter expansion on line 170 instead of the
if statements.
in git-radar, now there is a shift, and a regex check that the next value is a
number. If the next value after --fetch_t is not a number, an error is echo'd
and it resorts to the default behaviour of 5 minutes.
|
|
Issue69
|
