Sign in
googlers
/
jrn
/
git
/
f3ad062560bfd4a2983122de93d08f43ea66e7cf
/
git-pull.sh
31b9755
Recover dropped +x bit from git-pull.sh by accident.
by Junio C Hamano
· 19 years ago
93d69d8
Refactored merge options into separate merge-options.txt.
by Jon Loeliger
· 19 years ago
d8ae1d1
Document the --no-commit flag better
by Junio C Hamano
· 19 years ago
123ee3c
Add --no-commit to git-merge/git-pull.
by Junio C Hamano
· 19 years ago
619e5a0
git-pull: do not barf on -a flag meant for git-fetch.
by Junio C Hamano
· 19 years ago
60fb5b2
Use git-merge in git-pull (second try).
by Junio C Hamano
· 19 years ago
bf7960e
Use git-update-ref in scripts.
by Junio C Hamano
· 19 years ago
05dd8e2
Fix default pull not to do an unintended Octopus.
by Junio C Hamano
· 19 years ago
c8b48ba
Prettyprint octopus merge message.
by Junio C Hamano
· 19 years ago
acfadcf
Revert "Use git-merge instead of git-resolve in git-pull."
by Junio C Hamano
· 19 years ago
b91fb51
Revert "Make Octopus merge message a bit nicer."
by Junio C Hamano
· 19 years ago
63f1aa6
Make Octopus merge message a bit nicer.
by Junio C Hamano
· 19 years ago
f887564
Use git-merge instead of git-resolve in git-pull.
by Junio C Hamano
· 19 years ago
b4416b4
Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.
by Junio C Hamano
· 20 years ago
c80522e
Make merge comment git-pull makes for an octopus a bit prettier.
by Junio C Hamano
· 20 years ago
215a7ad
Big tool rename.
by Junio C Hamano
· 20 years ago
[Renamed (87%) from git-pull-script]
b10ac50
Fix pulling into the same branch.
by Junio C Hamano
· 20 years ago
521003f
[PATCH] Use git-octopus when pulling more than one heads.
by Junio C Hamano
· 20 years ago
e0bfc81
[PATCH] Retire git-parse-remote.
by Junio C Hamano
· 20 years ago
f170e4b
[PATCH] fetch/pull: short-hand notation for remote repositories.
by Junio C Hamano
· 20 years ago
3ba513c
Make "git resolve" take the merge message in $3
by Linus Torvalds
· 20 years ago
b33e966
Add "git-sh-setup-script" for common git shell script setup
by Linus Torvalds
· 20 years ago
5571be7
Duh. Fix transposed characters in git-pull-script
by Linus Torvalds
· 20 years ago
635f67f
Teach git-pull-script about pulling tags
by Linus Torvalds
· 20 years ago
6b38a40
Clean up different special *HEAD handling
by Linus Torvalds
· 20 years ago
5b1ea09
Make default merge messages denser.
by Linus Torvalds
· 20 years ago
ed37b5b
Make fetch/pull scripts terminate cleanly on errors
by Linus Torvalds
· 20 years ago
c5434de
git-pull-script: pretty-print the merge head information
by Linus Torvalds
· 20 years ago
7ef7692
Split up git-pull-script into separate "fetch" and "merge" phases.
by Linus Torvalds
· 20 years ago
8ac069a
Introduce GIT_DIR environment variable.
by Junio C Hamano
· 20 years ago
cc167cc
Add http and local transport support for git-pull-script.
by Junio C Hamano
· 20 years ago
67cc5c4
Split "git-pull-script" into two parts
by Linus Torvalds
· 20 years ago
4bea3b6
git-pull-script: do the diffstat also for the fast-forward case
by Linus Torvalds
· 20 years ago
552e2bd
Teach "git-pull-script" about alternate HEAD's to pull..
by Linus Torvalds
· 20 years ago
705acc5
git-pull-script: add a final "diffstat" to show the result of the merge.
by Linus Torvalds
· 20 years ago
2d280e1
Update the merge scripts for the big git rename.
by Linus Torvalds
· 20 years ago
d840b3b
[PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-script
by Rene Scharfe
· 20 years ago
9831d8f
git-pull-script: do automatic merges
by Linus Torvalds
· 20 years ago
8ccfbf3
Update "git-pull-script" to use "read-tree -m" for
by Linus Torvalds
· 20 years ago
4aaef10
Make git-pull-script do the right thing for symlinked HEAD's.
by Linus Torvalds
· 20 years ago
0ffb0bc
[PATCH] Do not let rsync obliterate .git/object symbolic link.
by Junio C Hamano
· 20 years ago
00829b5
Add "update-cache --refresh" to git-pull-script to make sure
by Linus Torvalds
· 20 years ago
839a7a0
Add the simple scripts I used to do a merge with content conflicts.
by Linus Torvalds
· 20 years ago