Google Git
Sign in
code / git / 572fc81d21b26d856dd3c2cc366b7452a4ed16e4
commit572fc81d21b26d856dd3c2cc366b7452a4ed16e4[log] [tgz]
authorJay Soffian <jaysoffian@gmail.com>Tue Feb 19 11:24:38 2008 -0500
committerJunio C Hamano <gitster@pobox.com>Tue Feb 19 21:22:29 2008 -0800
tree622e63b08bb0c79021d70ce2bc0d75a6f6565210
parent9ed36cfa35cfbd09c454f12194a91cd50ba284d1 [diff]
doc: documentation update for the branch track changes

Documents the branch.autosetupmerge=always setting and usage of --track
when branching from a local branch.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
3 files changed
tree: 622e63b08bb0c79021d70ce2bc0d75a6f6565210
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitk-git/
  7. gitweb/
  8. mozilla-sha1/
  9. perl/
  10. ppc/
  11. t/
  12. templates/
  13. xdiff/
  14. RelNotes ⇨ Documentation/RelNotes-1.5.4.txt
  15. .gitignore
  16. .mailmap
  17. alloc.c
  18. archive-tar.c
  19. archive-zip.c
  20. archive.c
  21. archive.h
  22. attr.c
  23. attr.h
  24. base85.c
  25. blob.c
  26. blob.h
  27. branch.c
  28. branch.h
  29. builtin-add.c
  30. builtin-annotate.c
  31. builtin-apply.c
  32. builtin-archive.c
  33. builtin-blame.c
  34. builtin-branch.c
  35. builtin-bundle.c
  36. builtin-cat-file.c
  37. builtin-check-attr.c
  38. builtin-check-ref-format.c
  39. builtin-checkout-index.c
  40. builtin-checkout.c
  41. builtin-clean.c
  42. builtin-commit-tree.c
  43. builtin-commit.c
  44. builtin-config.c
  45. builtin-count-objects.c
  46. builtin-describe.c
  47. builtin-diff-files.c
  48. builtin-diff-index.c
  49. builtin-diff-tree.c
  50. builtin-diff.c
  51. builtin-fast-export.c
  52. builtin-fetch--tool.c
  53. builtin-fetch-pack.c
  54. builtin-fetch.c
  55. builtin-fmt-merge-msg.c
  56. builtin-for-each-ref.c
  57. builtin-fsck.c
  58. builtin-gc.c
  59. builtin-grep.c
  60. builtin-http-fetch.c
  61. builtin-init-db.c
  62. builtin-log.c
  63. builtin-ls-files.c
  64. builtin-ls-remote.c
  65. builtin-ls-tree.c
  66. builtin-mailinfo.c
  67. builtin-mailsplit.c
  68. builtin-merge-base.c
  69. builtin-merge-file.c
  70. builtin-merge-ours.c
  71. builtin-merge-recursive.c
  72. builtin-mv.c
  73. builtin-name-rev.c
  74. builtin-pack-objects.c
  75. builtin-pack-refs.c
  76. builtin-prune-packed.c
  77. builtin-prune.c
  78. builtin-push.c
  79. builtin-read-tree.c
  80. builtin-reflog.c
  81. builtin-rerere.c
  82. builtin-reset.c
  83. builtin-rev-list.c
  84. builtin-rev-parse.c
  85. builtin-revert.c
  86. builtin-rm.c
  87. builtin-send-pack.c
  88. builtin-shortlog.c
  89. builtin-show-branch.c
  90. builtin-show-ref.c
  91. builtin-stripspace.c
  92. builtin-symbolic-ref.c
  93. builtin-tag.c
  94. builtin-tar-tree.c
  95. builtin-unpack-objects.c
  96. builtin-update-index.c
  97. builtin-update-ref.c
  98. builtin-upload-archive.c
  99. builtin-verify-pack.c
  100. builtin-verify-tag.c
  101. builtin-write-tree.c
  102. builtin.h
  103. bundle.c
  104. bundle.h
  105. cache-tree.c
  106. cache-tree.h
  107. cache.h
  108. check-builtins.sh
  109. check-racy.c
  110. color.c
  111. color.h
  112. combine-diff.c
  113. command-list.txt
  114. commit.c
  115. commit.h
  116. config.c
  117. config.mak.in
  118. configure.ac
  119. connect.c
  120. convert.c
  121. copy.c
  122. COPYING
  123. csum-file.c
  124. csum-file.h
  125. ctype.c
  126. daemon.c
  127. date.c
  128. decorate.c
  129. decorate.h
  130. delta.h
  131. diff-delta.c
  132. diff-lib.c
  133. diff.c
  134. diff.h
  135. diffcore-break.c
  136. diffcore-delta.c
  137. diffcore-order.c
  138. diffcore-pickaxe.c
  139. diffcore-rename.c
  140. diffcore.h
  141. dir.c
  142. dir.h
  143. dump-cache-tree.c
  144. entry.c
  145. environment.c
  146. exec_cmd.c
  147. exec_cmd.h
  148. fast-import.c
  149. fetch-pack.h
  150. fixup-builtins
  151. generate-cmdlist.sh
  152. git-add--interactive.perl
  153. git-am.sh
  154. git-archimport.perl
  155. git-bisect.sh
  156. git-clone.sh
  157. git-compat-util.h
  158. git-cvsexportcommit.perl
  159. git-cvsimport.perl
  160. git-cvsserver.perl
  161. git-filter-branch.sh
  162. git-help--browse.sh
  163. git-instaweb.sh
  164. git-lost-found.sh
  165. git-merge-octopus.sh
  166. git-merge-one-file.sh
  167. git-merge-resolve.sh
  168. git-merge-stupid.sh
  169. git-merge.sh
  170. git-mergetool.sh
  171. git-parse-remote.sh
  172. git-pull.sh
  173. git-quiltimport.sh
  174. git-rebase--interactive.sh
  175. git-rebase.sh
  176. git-relink.perl
  177. git-remote.perl
  178. git-repack.sh
  179. git-request-pull.sh
  180. git-send-email.perl
  181. git-sh-setup.sh
  182. git-stash.sh
  183. git-submodule.sh
  184. git-svn.perl
  185. GIT-VERSION-GEN
  186. git.c
  187. git.spec.in
  188. grep.c
  189. grep.h
  190. hash-object.c
  191. hash.c
  192. hash.h
  193. help.c
  194. http-push.c
  195. http-walker.c
  196. http.c
  197. http.h
  198. ident.c
  199. imap-send.c
  200. index-pack.c
  201. INSTALL
  202. interpolate.c
  203. interpolate.h
  204. list-objects.c
  205. list-objects.h
  206. lockfile.c
  207. log-tree.c
  208. log-tree.h
  209. mailmap.c
  210. mailmap.h
  211. Makefile
  212. match-trees.c
  213. merge-file.c
  214. merge-index.c
  215. merge-recursive.h
  216. merge-tree.c
  217. mktag.c
  218. mktree.c
  219. object-refs.c
  220. object.c
  221. object.h
  222. pack-check.c
  223. pack-redundant.c
  224. pack-write.c
  225. pack.h
  226. pager.c
  227. parse-options.c
  228. parse-options.h
  229. patch-delta.c
  230. patch-id.c
  231. patch-ids.c
  232. patch-ids.h
  233. path-list.c
  234. path-list.h
  235. path.c
  236. pkt-line.c
  237. pkt-line.h
  238. pretty.c
  239. progress.c
  240. progress.h
  241. quote.c
  242. quote.h
  243. reachable.c
  244. reachable.h
  245. read-cache.c
  246. README
  247. receive-pack.c
  248. reflog-walk.c
  249. reflog-walk.h
  250. refs.c
  251. refs.h
  252. remote.c
  253. remote.h
  254. revision.c
  255. revision.h
  256. run-command.c
  257. run-command.h
  258. send-pack.h
  259. server-info.c
  260. setup.c
  261. sha1_file.c
  262. sha1_name.c
  263. shallow.c
  264. shell.c
  265. show-index.c
  266. sideband.c
  267. sideband.h
  268. strbuf.c
  269. strbuf.h
  270. symlinks.c
  271. tag.c
  272. tag.h
  273. tar.h
  274. test-absolute-path.c
  275. test-chmtime.c
  276. test-date.c
  277. test-delta.c
  278. test-genrandom.c
  279. test-match-trees.c
  280. test-parse-options.c
  281. test-sha1.c
  282. test-sha1.sh
  283. trace.c
  284. transport.c
  285. transport.h
  286. tree-diff.c
  287. tree-walk.c
  288. tree-walk.h
  289. tree.c
  290. tree.h
  291. unpack-file.c
  292. unpack-trees.c
  293. unpack-trees.h
  294. update-server-info.c
  295. upload-pack.c
  296. usage.c
  297. utf8.c
  298. utf8.h
  299. var.c
  300. walker.c
  301. walker.h
  302. write_or_die.c
  303. ws.c
  304. wt-status.c
  305. wt-status.h
  306. xdiff-interface.c
  307. xdiff-interface.h