profile
viewpoint

jdigger/git-process 67

Scripts to help work with a good Git process

jdigger/gradle-template 6

OBSOLETE - Project for "archetype"-ing Gradle projects

jdigger/gant-common 2

Common build scripts for Gant

jdigger/boxen 1

My version of Boxen

jdigger/boxen-slides 1

presentation for DOSUG "Boxen: OSX Config Beyond Dotfiles"

jdigger/fog_test 1

area to test playing with the Ruby Fog library

jdigger/gradle-defaults 1

Plugin providing reasonable configurations for Gradle projects

brianliddle/puppet-adobe_em6 0

This is a puppet module to be used to set up and configuration Adobe Experience Manager 6.0

ItGumby/boxen-slides 0

presentation for DOSUG "Boxen: OSX Config Beyond Dotfiles"

pull request commenttj/git-extras

git-utimes: Change files modification time to their last commit date

@spacewander Thanks!

vt-alt

comment created time in 7 days

push eventtj/git-extras

Vitaly Chikunov

commit sha aa174b3905db58b9cf9ef5a5bea1e2fc6adecdca

git-utimes: Change files modification time to their last commit date Signed-off-by: Vitaly Chikunov <vt@altlinux.org>

view details

罗泽轩

commit sha e6caa931a5cca04fe2ac13f0d1cebf115b5ae400

Merge pull request #882 from vt-alt/git-utimes git-utimes: Change files modification time to their last commit date

view details

push time in 7 days

PR merged tj/git-extras

git-utimes: Change files modification time to their last commit date

New tool to change files modification time to their last commit date.

+239 -1

5 comments

8 changed files

vt-alt

pr closed time in 7 days

pull request commenttj/git-extras

git-utimes: Change files modification time to their last commit date

@vt-alt Sorry for my delay!

vt-alt

comment created time in 7 days

pull request commenttj/git-extras

git-utimes: Change files modification time to their last commit date

Almost three weeks passed since all requested changes are applied. Is there anything to add?

vt-alt

comment created time in 7 days

pull request commenttj/git-extras

fix: zsh completion of git-coauthor command

@Aloxaf Merged. Thanks!

Aloxaf

comment created time in 9 days

push eventtj/git-extras

Aloxaf

commit sha e92d54cadb42c5aaf3020e9658aeca12bcfc98a7

fix: zsh completion of git-coauthor command

view details

罗泽轩

commit sha 6b45d4322bd01c1a62c0b625a4a6458857b4ceb2

Merge pull request #896 from Aloxaf/fix_completion fix: zsh completion of git-coauthor command

view details

push time in 9 days

PR opened tj/git-extras

fix: zsh completion of git-coauthor command
+1 -1

0 comment

1 changed file

pr created time in 9 days

push eventtj/git-extras

vanpipy

commit sha 41732e41130c2aee1f15ef83412ce2b0bb338bd0

feat(create-branch): add optional --from to set the start point

view details

vanpipy

commit sha d3772eb469e665d376d2c7b67ff42c36fa2b3b0a

feat(feature): checkout from start point if exists

view details

vanpipy

commit sha b2b5c97105aa891ee36db742584b0e88017160ff

doc: add the usage of the parameter `--from` for create-branch and feature

view details

罗泽轩

commit sha 444722cf389792f133433164c570f95fd12b84fa

Merge pull request #895 from vanpipy/feature/optional-start-point-when-creeate-branch feat(#861): add optional parameter --from to set the start point

view details

push time in 15 days

issue closedtj/git-extras

Add start-point option to `git feature`

Currently, git feature creates a new branch based on the current active one.

As git flow specifies that feature branches should be based on develop, it would be nice to be able to specify a start-point, so we don't need to switch branches first.

After finishing a feature, I currently need to run 3 commands to create my new feature branch:

git checkout develop
git pull
git feature my-feat

It would be awesome if we could simplify those 3 lines to a single command:

# git feature <branchname> [<start-point>]
  git feature my-feat develop 

Regardless of my active branch, git feature my-feat develop would:

  • pull/fetch the commits from origin
  • create a new branch with develop as start-point,
  • check out the new feature branch.

Does git-extras have global options? It would be awesome to be able to set the default start-point trough a global option

closed time in 15 days

smeijer

pull request commenttiimgreen/github-cheat-sheet

Added GitHub CLI tools article

@ShockwaveNN Agreed with you but it would be always better for a reader if he can get all the information on a single page with working examples and screenshots. In this blog, found summarized information with examples so would be easy for any reader.

pareek-narendra

comment created time in 17 days

pull request commenttiimgreen/github-cheat-sheet

Added GitHub CLI tools article

I agree that GitHub CLI be mention in this guide, but why link for someone blog, if this can be link to official repo with same info https://github.com/cli/cli

pareek-narendra

comment created time in 17 days

pull request commenttj/git-extras

feat(#861): add optional parameter --from to set the start point

@vanpipy Would you update the doc?

Hi, @spacewander ,

The git-create-branch and git-feature docs will update at the next commit.

vanpipy

comment created time in 17 days

pull request commenttj/git-extras

feat(#861): add optional parameter --from to set the start point

@vanpipy Would you update the doc?

vanpipy

comment created time in 17 days

Pull request review commenttj/git-extras

feat(#861): add optional parameter --from to set the start point

 then 	rm -f "$stderr" 	if [ $REMOTE_EXIT -eq 0 ] 	then-		git push $REMOTE HEAD:refs/heads/$BRANCH-		git fetch $REMOTE-		git checkout --track -b $BRANCH $REMOTE/$BRANCH+		if [[ -n $START_POINT ]]+		then

Update.

And a question I want to ask is how to choose the type of using the style of the if then:

Style A:

if [[ ... ]]; then
   ...
fi

Style B:

if [[ ... ]]
then
    ...
fi

Both of them exist in the file. That confuse me a little.

Thanks :D.

vanpipy

comment created time in 17 days

Pull request review commenttj/git-extras

feat(#861): add optional parameter --from to set the start point

 do 				REMOTE=origin 			fi 			;;+		--from)+			if [[ -n $2 ]]+			then

Update.

vanpipy

comment created time in 17 days

Pull request review commenttj/git-extras

feat(#861): add optional parameter --from to set the start point

 then 	rm -f "$stderr" 	if [ $REMOTE_EXIT -eq 0 ] 	then-		git push $REMOTE HEAD:refs/heads/$BRANCH-		git fetch $REMOTE-		git checkout --track -b $BRANCH $REMOTE/$BRANCH+		if [[ -n $START_POINT ]]+		then
		if [[ -n $START_POINT ]]; then
vanpipy

comment created time in 17 days

Pull request review commenttj/git-extras

feat(#861): add optional parameter --from to set the start point

 do 				REMOTE=origin 			fi 			;;+		--from)+			if [[ -n $2 ]]+			then
			if [[ -n $2 ]]; then
vanpipy

comment created time in 17 days

pull request commenttj/git-extras

Merge-into: add stash before to checkout

@alessandro308 Merged. Thanks!

alessandro308

comment created time in 19 days

push eventtj/git-extras

Alessandro Pagiaro

commit sha aa5a3809962f4deee8e1a4479adabd03dd11c5e3

Merge-into: add stash before to checkout

view details

罗泽轩

commit sha 18bcfcd38ec4c10baaefc9a8a16b6c1856471519

Merge pull request #894 from alessandro308/merge-into-stashed Merge-into: add stash before to checkout

view details

push time in 19 days

PR merged tj/git-extras

Merge-into: add stash before to checkout

Sometimes, if you have dirty env, git checkout fails due to unstashed files.

+14 -0

0 comment

1 changed file

alessandro308

pr closed time in 19 days

PR opened tj/git-extras

Merge-into: add stash before to checkout

Sometimes, if you have dirty env, git checkout fails due to unstashed files.

+14 -0

0 comment

1 changed file

pr created time in 19 days

issue openedtj/git-extras

Request: Add merge-into-remote

Add a command to merge into remote branch, basically, something like:

git merge-into dev; git checkout dev; git push origin dev

created time in 20 days

push eventtj/git-extras

equt

commit sha f66f7e484fa1732f97402f3b6be958d8d8adb27a

[ fix #891 ] Cast branch output if HEAD not exists

view details

罗泽轩

commit sha 68e6a1540140e8c2dd9bc57eaca2682d92bae32f

Merge pull request #892 from equt/#891 [ fix #891 ] Cast branch output if HEAD not exists

view details

push time in 22 days

issue closedtj/git-extras

Git Browse Failed to Handle Brand New Repo

Git browse would first check the current HEAD and output a git fatal for the following line.

https://github.com/tj/git-extras/blob/ad8c77bfa39c257ba7a7ea31ed5ce6fa3a699611/bin/git-browse#L5

fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

To reproduce, just run git browse inside a brand new git repo. Casting the error into /dev/null should fix it.

closed time in 22 days

equt

PR merged tj/git-extras

[ fix #891 ] Cast branch output if HEAD not exists

c.c. #891

+1 -1

0 comment

1 changed file

equt

pr closed time in 22 days

more