49 Commits (42c8c74c1401352b0f388e47a2c9fcd52171c9d3)

Author SHA1 Message Date
Jay Soffian 0d2dd191cd pull: pass --strategy along to to rebase 17 years ago
Johannes Schindelin c85c79279d pull --rebase: be cleverer with rebased upstream branches 17 years ago
Junio C Hamano 441ed4131b "git pull --tags": error out with a better message. 17 years ago
Johannes Schindelin cd67e4d46b Teach 'git pull' about --rebase 17 years ago
Junio C Hamano 8f321a3925 scripts: Add placeholders for OPTIONS_SPEC 17 years ago
Lars Hjemli 5072a32382 Teach git-pull about --[no-]ff, --no-squash and --commit 17 years ago
Federico Mena Quintero 8fc293cb1e Make git-pull complain and give advice when there is nothing to merge with 17 years ago
David Kastrup 822f7c7349 Supplant the "while case ... break ;; esac" idiom 18 years ago
Junio C Hamano 5be60078c9 Rewrite "git-frotz" to "git frotz" 18 years ago
Alex Riesen 51e7ecf4ec Add a configuration option to control diffstat after merge 18 years ago
Jeff King a74b1706c8 git-pull: disallow implicit merging to detached HEAD 18 years ago
Junio C Hamano 533b70390e Allow whole-tree operations to be started from a subdirectory 18 years ago
Shawn O. Pearce 7eff28a9b4 Disallow working directory commands in a bare repository. 18 years ago
Junio C Hamano d1014a1745 fail pull/merge early in the middle of conflicted merge 18 years ago
Shawn O. Pearce 6b5a795bf5 Allow git-merge to select the default strategy. 18 years ago
Shawn O. Pearce bf699582fd Ensure `git-pull` fails if `git-merge` fails. 18 years ago
Shawn O. Pearce f94741324e Use GIT_REFLOG_ACTION environment variable instead. 18 years ago
Josef Weidendorfer 4363dfbe3d Move "no merge candidate" warning into git-pull 18 years ago
Linus Torvalds d09e79cb1c git-pull: allow pulling into an empty repository 18 years ago
Junio C Hamano a057f80667 git-pull: we say commit X, not X commit. 18 years ago
Shawn Pearce e1447e38c0 Log ref changes made by git-merge and git-pull. 19 years ago
Shawn Pearce 55b7835e1b Log ref changes made by git-fetch and git-pull. 19 years ago
Dennis Stosberg 8096fae726 Fix expr usage for FreeBSD 19 years ago
Junio C Hamano 7d0c68871a git-merge --squash 19 years ago
Junio C Hamano 86378b3289 git-pull: abort when fmt-merge-msg fails. 19 years ago
Junio C Hamano 8323124afe git-pull: reword "impossible to fast-forward" message. 19 years ago
Junio C Hamano cf46e7b899 git-pull: further safety while on tracking branch. 19 years ago
Junio C Hamano f5ef535ff5 git-pull: run repo-config with dash form. 19 years ago
Mark Hollomon c8e2db00f9 Let merge set the default strategy. 19 years ago
Junio C Hamano 4890f62bc0 Avoid using "git-var -l" until it gets fixed. 19 years ago
freku045@student.liu.se 806f36d4d7 Trivial usage string clean-up 19 years ago
Junio C Hamano ae2b0f1518 git-sh-setup: die if outside git repository. 19 years ago
Junio C Hamano a1c292958f Make git-recursive the default strategy for git-pull. 19 years ago
Junio C Hamano 31b9755a65 Recover dropped +x bit from git-pull.sh by accident. 19 years ago
Jon Loeliger 93d69d8691 Refactored merge options into separate merge-options.txt. 19 years ago
Junio C Hamano d8ae1d10cd Document the --no-commit flag better 19 years ago
Junio C Hamano 123ee3ca7b Add --no-commit to git-merge/git-pull. 19 years ago
Junio C Hamano 619e5a0ed4 git-pull: do not barf on -a flag meant for git-fetch. 20 years ago
Junio C Hamano 60fb5b2c4d Use git-merge in git-pull (second try). 20 years ago
Junio C Hamano bf7960eb51 Use git-update-ref in scripts. 20 years ago
Junio C Hamano 05dd8e2ee2 Fix default pull not to do an unintended Octopus. 20 years ago
Junio C Hamano c8b48ba476 Prettyprint octopus merge message. 20 years ago
Junio C Hamano acfadcfb48 Revert "Use git-merge instead of git-resolve in git-pull." 20 years ago
Junio C Hamano b91fb518cc Revert "Make Octopus merge message a bit nicer." 20 years ago
Junio C Hamano 63f1aa6c72 Make Octopus merge message a bit nicer. 20 years ago
Junio C Hamano f887564ab7 Use git-merge instead of git-resolve in git-pull. 20 years ago
Junio C Hamano b4416b432b Revert breakage introduced by c80522e30f. 20 years ago
Junio C Hamano c80522e30f Make merge comment git-pull makes for an octopus a bit prettier. 20 years ago
Junio C Hamano 215a7ad1ef Big tool rename. 20 years ago
Junio C Hamano b10ac50f1e Fix pulling into the same branch. 20 years ago