kernel/git - git - PowerEL Git System

7359 Commits

6 Branches

36 Tags

131 MiB

Tree: 4aec56d12b

Commit Graph

Author SHA1 Message Date

Author	SHA1	Message	Date
Junio C Hamano	f8a9d42872	read-tree: further loosen "working file will be lost" check. This follows up commit `ed93b449` where we removed overcautious "working file will be lost" check. A new option "--exclude-per-directory=.gitignore" can be used to tell the "git-read-tree" command that the user does not mind losing contents in untracked files in the working tree, if they need to be overwritten by a merge (either a two-way "switch branches" merge, or a three-way merge). Signed-off-by: Junio C Hamano <junkio@cox.net>	18 years ago
Johannes Schindelin	076b0adcf9	read-tree: move merge functions to the library This will allow merge-recursive to use the read-tree functionality without exec()ing git-read-tree. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Johannes Schindelin	16da134b1f	read-trees: refactor the unpack_trees() part Basically, the options are passed by a struct unpack_trees_options now. That's all. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago

Junio C Hamano

f8a9d42872

read-tree: further loosen "working file will be lost" check.

This follows up commit ed93b449 where we removed overcautious
"working file will be lost" check.

A new option "--exclude-per-directory=.gitignore" can be used to
tell the "git-read-tree" command that the user does not mind
losing contents in untracked files in the working tree, if they
need to be overwritten by a merge (either a two-way "switch
branches" merge, or a three-way merge).

Signed-off-by: Junio C Hamano <junkio@cox.net>

18 years ago

Johannes Schindelin

076b0adcf9

read-tree: move merge functions to the library

This will allow merge-recursive to use the read-tree functionality
without exec()ing git-read-tree.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

19 years ago

Johannes Schindelin

16da134b1f

read-trees: refactor the unpack_trees() part

Basically, the options are passed by a struct unpack_trees_options now.
That's all.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

19 years ago

3 Commits (4aec56d12ba66a321ce8a6db2ab60f81be5ccfc5)