Sign in
googlers
/
jrn
/
git
/
a1b475eeb40dc29246d4ce7465474479639769d0
/
git-pull.sh
1ee740e
Merge branch 'ab/pull-rebase-config'
by Junio C Hamano
· 13 years ago
6b37dff
pull: introduce a pull.rebase option to enable --rebase
by Ævar Arnfjörð Bjarmason
· 13 years ago
f2b5163
Merge branch 'jk/pull-rebase-with-work-tree'
by Junio C Hamano
· 13 years ago
035b5bf
pull,rebase: handle GIT_WORK_TREE better
by Jeff King
· 13 years ago
87182b1
use -h for synopsis and --help for manpage consistently
by Clemens Buchacher
· 13 years ago
9574500
Merge branch 'js/i18n-scripts'
by Junio C Hamano
· 14 years ago
1421fd9
Merge branch 'oa/pull-reflog'
by Junio C Hamano
· 14 years ago
c2b1a95
pull: take advantage of eval_gettextln
by Jon Seymour
· 14 years ago
c98d1e4
pull: remove extra space from reflog message
by Ori Avtalion
· 14 years ago
3320a97
i18n: git-pull eval_gettext + warning message
by Ævar Arnfjörð Bjarmason
· 14 years ago
9f35aaa
i18n: git-pull eval_gettext + die message
by Ævar Arnfjörð Bjarmason
· 14 years ago
85af5f8
i18n: git-pull die messages
by Ævar Arnfjörð Bjarmason
· 14 years ago
a9f5786
i18n: git-pull add git-sh-i18n
by Ævar Arnfjörð Bjarmason
· 14 years ago
78c6e0f
Merge branch 'mz/rebase'
by Junio C Hamano
· 14 years ago
2071fb0
Merge branch 'jl/submodule-fetch-on-demand'
by Junio C Hamano
· 14 years ago
4b3ffe5
pull: do not clobber untracked files on initial pull
by Jeff King
· 14 years ago
0ce6a51
Merge branch 'jk/merge-rename-ux'
by Junio C Hamano
· 14 years ago
8f0700d
fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
by Jens Lehmann
· 14 years ago
bebd2fd
pull: propagate --progress to merge
by Jeff King
· 14 years ago
24231e0
pull: do not display fetch usage on --help-all
by Michael J Gruber
· 14 years ago
15a147e
rebase: use @{upstream} if no upstream specified
by Martin von Zweigbergk
· 14 years ago
4bb4d30
Merge branch 'jl/fetch-submodule-recursive'
by Junio C Hamano
· 14 years ago
be254a0
Add the 'fetch.recurseSubmodules' config setting
by Jens Lehmann
· 14 years ago
7dce19d
fetch/pull: Add the --recurse-submodules option
by Jens Lehmann
· 14 years ago
92c62a3
Porcelain scripts: Rewrite cryptic "needs update" error message
by Ramkumar Ramachandra
· 14 years ago
d25c72f
Merge branch 'en/rebase-against-rebase-fix'
by Junio C Hamano
· 15 years ago
cf65426
pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
by Elijah Newren
· 15 years ago
29609e6
pull: do nothing on --dry-run
by Jeff King
· 15 years ago
96203bb
Merge branch 'maint'
by Junio C Hamano
· 15 years ago
0d12e59
pull: replace unnecessary sed invocation
by Stephen Boyd
· 15 years ago
9839018
fetch and pull: learn --progress
by Tay Ray Chuan
· 15 years ago
7ecee33
pull: re-fix command line generation
by Junio C Hamano
· 15 years ago
fcb2a7e
Merge branch 'ap/merge-backend-opts'
by Junio C Hamano
· 15 years ago
14e5d40
pull: Fix parsing of -X<option>
by Junio C Hamano
· 15 years ago
ee2c795
Teach git-pull to pass -X<option> to git-merge
by Avery Pennarun
· 15 years ago
d38a30d
Be more user-friendly when refusing to do something because of conflict.
by Matthieu Moy
· 15 years ago
ff86bdd
Merge branch 'maint'
by Junio C Hamano
· 15 years ago
77c29b4
Revert recent "git merge <msg> HEAD <commit>..." deprecation
by Junio C Hamano
· 15 years ago
995fc2f
pull: clarify advice for the unconfigured error case
by Jan Krüger
· 15 years ago
c0ecb07
git-pull.sh: Fix call to git-merge for new command format
by Horst H. von Brand
· 15 years ago
4d8c325
Merge branch 'fc/doc-fast-forward'
by Junio C Hamano
· 15 years ago
1347483
Teach 'git merge' and 'git pull' the option --ff-only
by Björn Gustavsson
· 15 years ago
a75d7b5
Use 'fast-forward' all over the place
by Felipe Contreras
· 15 years ago
a8c9bef
pull: improve advice for unconfigured error case
by Jeff King
· 15 years ago
4973aa2
git-pull: dead code removal
by Junio C Hamano
· 15 years ago
a6dbf88
pull: Clarify "helpful" message for another corner case
by Junio C Hamano
· 16 years ago
v1.6.5-rc2
19a7fcb
allow pull --rebase on branch yet to be born
by Jeff King
· 16 years ago
d44e712
pull: support rebased upstream + fetch + pull --rebase
by Santi Béjar
· 16 years ago
12d4ffa
Merge branch 'sb/pull-rebase'
by Junio C Hamano
· 16 years ago
bc2bbc4
pull, rebase: simplify to use die()
by Stephen Boyd
· 16 years ago
97af7ff
parse-remote: function to get the tracking branch to be merge
by Santi Béjar
· 16 years ago
7bd93c1
Convert to use quiet option when available
by Dan Loewenherz
· 16 years ago
796b137
Merge branch 'maint'
by Junio C Hamano
· 16 years ago
61e6108
git-pull.sh: better warning message for "git pull" on detached head.
by Matthieu Moy
· 16 years ago
a334e12
git-pull: Allow --stat and --no-stat to be used with --rebase
by Tor Arne Vestbø
· 16 years ago
51b2ead
disallow providing multiple upstream branches to rebase, pull --rebase
by Jay Soffian
· 16 years ago
2d17985
pull: use git rev-parse -q
by Miklos Vajna
· 16 years ago
c6576f9
Retain multiple -q/-v occurrences in git pull
by Tuncer Ayaz
· 16 years ago
7f87aff
Teach/Fix pull/fetch -q/-v options
by Tuncer Ayaz
· 16 years ago
b0ad11e
pull: allow "git pull origin $something:$current_branch" into an unborn branch
by Junio C Hamano
· 16 years ago
7d90c8e
Ignore dirty submodule states in "git pull --rebase"
by Johannes Schindelin
· 17 years ago
1b1dd23
Make usage strings dash-less
by Stephan Beyer
· 17 years ago
f9189cf
pull --rebase: exit early when the working directory is dirty
by Johannes Schindelin
· 17 years ago
efb779f
merge, pull: add '--(no-)log' command line option
by SZEDER Gábor
· 17 years ago
d8abe14
merge, pull: introduce '--(no-)stat' option
by SZEDER Gábor
· 17 years ago
0d2dd19
pull: pass --strategy along to to rebase
by Jay Soffian
· 17 years ago
c85c792
pull --rebase: be cleverer with rebased upstream branches
by Johannes Schindelin
· 17 years ago
441ed41
"git pull --tags": error out with a better message.
by Junio C Hamano
· 17 years ago
cd67e4d
Teach 'git pull' about --rebase
by Johannes Schindelin
· 17 years ago
8f321a3
scripts: Add placeholders for OPTIONS_SPEC
by Junio C Hamano
· 17 years ago
5072a32
Teach git-pull about --[no-]ff, --no-squash and --commit
by Lars Hjemli
· 17 years ago
8fc293c
Make git-pull complain and give advice when there is nothing to merge with
by Federico Mena Quintero
· 17 years ago
822f7c7
Supplant the "while case ... break ;; esac" idiom
by David Kastrup
· 18 years ago
5be6007
Rewrite "git-frotz" to "git frotz"
by Junio C Hamano
· 18 years ago
51e7ecf
Add a configuration option to control diffstat after merge
by Alex Riesen
· 18 years ago
a74b170
git-pull: disallow implicit merging to detached HEAD
by Jeff King
· 18 years ago
533b703
Allow whole-tree operations to be started from a subdirectory
by Junio C Hamano
· 18 years ago
7eff28a
Disallow working directory commands in a bare repository.
by Shawn O. Pearce
· 18 years ago
d1014a1
fail pull/merge early in the middle of conflicted merge
by Junio C Hamano
· 18 years ago
6b5a795
Allow git-merge to select the default strategy.
by Shawn O. Pearce
· 18 years ago
bf69958
Ensure `git-pull` fails if `git-merge` fails.
by Shawn O. Pearce
· 18 years ago
f947413
Use GIT_REFLOG_ACTION environment variable instead.
by Shawn O. Pearce
· 18 years ago
4363dfb
Move "no merge candidate" warning into git-pull
by Josef Weidendorfer
· 18 years ago
d09e79c
git-pull: allow pulling into an empty repository
by Linus Torvalds
· 18 years ago
a057f80
git-pull: we say commit X, not X commit.
by Junio C Hamano
· 18 years ago
e1447e3
Log ref changes made by git-merge and git-pull.
by Shawn Pearce
· 19 years ago
55b7835
Log ref changes made by git-fetch and git-pull.
by Shawn Pearce
· 19 years ago
8096fae
Fix expr usage for FreeBSD
by Dennis Stosberg
· 19 years ago
7d0c688
git-merge --squash
by Junio C Hamano
· 19 years ago
86378b3
git-pull: abort when fmt-merge-msg fails.
by Junio C Hamano
· 19 years ago
8323124
git-pull: reword "impossible to fast-forward" message.
by Junio C Hamano
· 19 years ago
cf46e7b
git-pull: further safety while on tracking branch.
by Junio C Hamano
· 19 years ago
f5ef535
git-pull: run repo-config with dash form.
by Junio C Hamano
· 19 years ago
c8e2db0
Let merge set the default strategy.
by Mark Hollomon
· 19 years ago
4890f62
Avoid using "git-var -l" until it gets fixed.
by Junio C Hamano
· 19 years ago
806f36d
Trivial usage string clean-up
by freku045@student.liu.se
· 19 years ago
ae2b0f1
git-sh-setup: die if outside git repository.
by Junio C Hamano
· 19 years ago
a1c2929
Make git-recursive the default strategy for git-pull.
by Junio C Hamano
· 19 years ago
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
Next »