Google Git
Sign in
googlers / jrn / git / 397d596f84209d0e9d17621ce56b5432bc98d368 / git-pull.sh
  1. ff86bdd Merge branch 'maint' by Junio C Hamano · 15 years ago
  2. 77c29b4 Revert recent "git merge <msg> HEAD <commit>..." deprecation by Junio C Hamano · 15 years ago
  3. 995fc2f pull: clarify advice for the unconfigured error case by Jan Krüger · 15 years ago
  4. c0ecb07 git-pull.sh: Fix call to git-merge for new command format by Horst H. von Brand · 15 years ago
  5. 4d8c325 Merge branch 'fc/doc-fast-forward' by Junio C Hamano · 15 years ago
  6. 1347483 Teach 'git merge' and 'git pull' the option --ff-only by Björn Gustavsson · 15 years ago
  7. a75d7b5 Use 'fast-forward' all over the place by Felipe Contreras · 15 years ago
  8. a8c9bef pull: improve advice for unconfigured error case by Jeff King · 15 years ago
  9. 4973aa2 git-pull: dead code removal by Junio C Hamano · 15 years ago
  10. a6dbf88 pull: Clarify "helpful" message for another corner case by Junio C Hamano · 16 years ago v1.6.5-rc2
  11. 19a7fcb allow pull --rebase on branch yet to be born by Jeff King · 16 years ago
  12. d44e712 pull: support rebased upstream + fetch + pull --rebase by Santi Béjar · 16 years ago
  13. 12d4ffa Merge branch 'sb/pull-rebase' by Junio C Hamano · 16 years ago
  14. bc2bbc4 pull, rebase: simplify to use die() by Stephen Boyd · 16 years ago
  15. 97af7ff parse-remote: function to get the tracking branch to be merge by Santi Béjar · 16 years ago
  16. 7bd93c1 Convert to use quiet option when available by Dan Loewenherz · 16 years ago
  17. 796b137 Merge branch 'maint' by Junio C Hamano · 16 years ago
  18. 61e6108 git-pull.sh: better warning message for "git pull" on detached head. by Matthieu Moy · 16 years ago
  19. a334e12 git-pull: Allow --stat and --no-stat to be used with --rebase by Tor Arne Vestbø · 16 years ago
  20. 51b2ead disallow providing multiple upstream branches to rebase, pull --rebase by Jay Soffian · 16 years ago
  21. 2d17985 pull: use git rev-parse -q by Miklos Vajna · 16 years ago
  22. c6576f9 Retain multiple -q/-v occurrences in git pull by Tuncer Ayaz · 16 years ago
  23. 7f87aff Teach/Fix pull/fetch -q/-v options by Tuncer Ayaz · 16 years ago
  24. b0ad11e pull: allow "git pull origin $something:$current_branch" into an unborn branch by Junio C Hamano · 16 years ago
  25. 7d90c8e Ignore dirty submodule states in "git pull --rebase" by Johannes Schindelin · 17 years ago
  26. 1b1dd23 Make usage strings dash-less by Stephan Beyer · 17 years ago
  27. f9189cf pull --rebase: exit early when the working directory is dirty by Johannes Schindelin · 17 years ago
  28. efb779f merge, pull: add '--(no-)log' command line option by SZEDER Gábor · 17 years ago
  29. d8abe14 merge, pull: introduce '--(no-)stat' option by SZEDER Gábor · 17 years ago
  30. 0d2dd19 pull: pass --strategy along to to rebase by Jay Soffian · 17 years ago
  31. c85c792 pull --rebase: be cleverer with rebased upstream branches by Johannes Schindelin · 17 years ago
  32. 441ed41 "git pull --tags": error out with a better message. by Junio C Hamano · 17 years ago
  33. cd67e4d Teach 'git pull' about --rebase by Johannes Schindelin · 17 years ago
  34. 8f321a3 scripts: Add placeholders for OPTIONS_SPEC by Junio C Hamano · 17 years ago
  35. 5072a32 Teach git-pull about --[no-]ff, --no-squash and --commit by Lars Hjemli · 17 years ago
  36. 8fc293c Make git-pull complain and give advice when there is nothing to merge with by Federico Mena Quintero · 17 years ago
  37. 822f7c7 Supplant the "while case ... break ;; esac" idiom by David Kastrup · 17 years ago
  38. 5be6007 Rewrite "git-frotz" to "git frotz" by Junio C Hamano · 18 years ago
  39. 51e7ecf Add a configuration option to control diffstat after merge by Alex Riesen · 18 years ago
  40. a74b170 git-pull: disallow implicit merging to detached HEAD by Jeff King · 18 years ago
  41. 533b703 Allow whole-tree operations to be started from a subdirectory by Junio C Hamano · 18 years ago
  42. 7eff28a Disallow working directory commands in a bare repository. by Shawn O. Pearce · 18 years ago
  43. d1014a1 fail pull/merge early in the middle of conflicted merge by Junio C Hamano · 18 years ago
  44. 6b5a795 Allow git-merge to select the default strategy. by Shawn O. Pearce · 18 years ago
  45. bf69958 Ensure `git-pull` fails if `git-merge` fails. by Shawn O. Pearce · 18 years ago
  46. f947413 Use GIT_REFLOG_ACTION environment variable instead. by Shawn O. Pearce · 18 years ago
  47. 4363dfb Move "no merge candidate" warning into git-pull by Josef Weidendorfer · 18 years ago
  48. d09e79c git-pull: allow pulling into an empty repository by Linus Torvalds · 18 years ago
  49. a057f80 git-pull: we say commit X, not X commit. by Junio C Hamano · 18 years ago
  50. e1447e3 Log ref changes made by git-merge and git-pull. by Shawn Pearce · 19 years ago
  51. 55b7835 Log ref changes made by git-fetch and git-pull. by Shawn Pearce · 19 years ago
  52. 8096fae Fix expr usage for FreeBSD by Dennis Stosberg · 19 years ago
  53. 7d0c688 git-merge --squash by Junio C Hamano · 19 years ago
  54. 86378b3 git-pull: abort when fmt-merge-msg fails. by Junio C Hamano · 19 years ago
  55. 8323124 git-pull: reword "impossible to fast-forward" message. by Junio C Hamano · 19 years ago
  56. cf46e7b git-pull: further safety while on tracking branch. by Junio C Hamano · 19 years ago
  57. f5ef535 git-pull: run repo-config with dash form. by Junio C Hamano · 19 years ago
  58. c8e2db0 Let merge set the default strategy. by Mark Hollomon · 19 years ago
  59. 4890f62 Avoid using "git-var -l" until it gets fixed. by Junio C Hamano · 19 years ago
  60. 806f36d Trivial usage string clean-up by freku045@student.liu.se · 19 years ago
  61. ae2b0f1 git-sh-setup: die if outside git repository. by Junio C Hamano · 19 years ago
  62. a1c2929 Make git-recursive the default strategy for git-pull. by Junio C Hamano · 19 years ago
  63. 31b9755 Recover dropped +x bit from git-pull.sh by accident. by Junio C Hamano · 19 years ago
  64. 93d69d8 Refactored merge options into separate merge-options.txt. by Jon Loeliger · 19 years ago
  65. d8ae1d1 Document the --no-commit flag better by Junio C Hamano · 19 years ago
  66. 123ee3c Add --no-commit to git-merge/git-pull. by Junio C Hamano · 19 years ago
  67. 619e5a0 git-pull: do not barf on -a flag meant for git-fetch. by Junio C Hamano · 19 years ago
  68. 60fb5b2 Use git-merge in git-pull (second try). by Junio C Hamano · 19 years ago
  69. bf7960e Use git-update-ref in scripts. by Junio C Hamano · 19 years ago
  70. 05dd8e2 Fix default pull not to do an unintended Octopus. by Junio C Hamano · 19 years ago
  71. c8b48ba Prettyprint octopus merge message. by Junio C Hamano · 19 years ago
  72. acfadcf Revert "Use git-merge instead of git-resolve in git-pull." by Junio C Hamano · 19 years ago
  73. b91fb51 Revert "Make Octopus merge message a bit nicer." by Junio C Hamano · 19 years ago
  74. 63f1aa6 Make Octopus merge message a bit nicer. by Junio C Hamano · 20 years ago
  75. f887564 Use git-merge instead of git-resolve in git-pull. by Junio C Hamano · 20 years ago
  76. b4416b4 Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93. by Junio C Hamano · 20 years ago
  77. c80522e Make merge comment git-pull makes for an octopus a bit prettier. by Junio C Hamano · 20 years ago
  78. 215a7ad Big tool rename. by Junio C Hamano · 20 years ago[Renamed (87%) from git-pull-script]
  79. b10ac50 Fix pulling into the same branch. by Junio C Hamano · 20 years ago
  80. 521003f [PATCH] Use git-octopus when pulling more than one heads. by Junio C Hamano · 20 years ago
  81. e0bfc81 [PATCH] Retire git-parse-remote. by Junio C Hamano · 20 years ago
  82. f170e4b [PATCH] fetch/pull: short-hand notation for remote repositories. by Junio C Hamano · 20 years ago
  83. 3ba513c Make "git resolve" take the merge message in $3 by Linus Torvalds · 20 years ago
  84. b33e966 Add "git-sh-setup-script" for common git shell script setup by Linus Torvalds · 20 years ago
  85. 5571be7 Duh. Fix transposed characters in git-pull-script by Linus Torvalds · 20 years ago
  86. 635f67f Teach git-pull-script about pulling tags by Linus Torvalds · 20 years ago
  87. 6b38a40 Clean up different special *HEAD handling by Linus Torvalds · 20 years ago
  88. 5b1ea09 Make default merge messages denser. by Linus Torvalds · 20 years ago
  89. ed37b5b Make fetch/pull scripts terminate cleanly on errors by Linus Torvalds · 20 years ago
  90. c5434de git-pull-script: pretty-print the merge head information by Linus Torvalds · 20 years ago
  91. 7ef7692 Split up git-pull-script into separate "fetch" and "merge" phases. by Linus Torvalds · 20 years ago
  92. 8ac069a Introduce GIT_DIR environment variable. by Junio C Hamano · 20 years ago
  93. cc167cc Add http and local transport support for git-pull-script. by Junio C Hamano · 20 years ago
  94. 67cc5c4 Split "git-pull-script" into two parts by Linus Torvalds · 20 years ago
  95. 4bea3b6 git-pull-script: do the diffstat also for the fast-forward case by Linus Torvalds · 20 years ago
  96. 552e2bd Teach "git-pull-script" about alternate HEAD's to pull.. by Linus Torvalds · 20 years ago
  97. 705acc5 git-pull-script: add a final "diffstat" to show the result of the merge. by Linus Torvalds · 20 years ago
  98. 2d280e1 Update the merge scripts for the big git rename. by Linus Torvalds · 20 years ago
  99. d840b3b [PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-script by Rene Scharfe · 20 years ago
  100. 9831d8f git-pull-script: do automatic merges by Linus Torvalds · 20 years ago