| 2007-04-18 | Start preparing for 1.5.1.2 |
diff | tree |
| 2007-04-18 | Merge branch 'master' of git://repo.or.cz/git-gui |
diff | tree |
| 2007-04-18 | Merge branch 'maint' of git://repo.or.cz/git-gui into... |
diff | tree |
| 2007-04-17 | Merge branch 'jc/read-tree-df' |
diff | tree |
| 2007-04-17 | Add a demonstration/test of customized merge. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-17 | Allow specifying specialized merge-backend per path. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-17 | git-gui: Honor TCLTK_PATH if supplied Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-17 | merge-recursive: separate out xdl_merge() interface. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-17 | Allow more than true/false to attributes. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-17 | Make sure quickfetch is not fooled with a previous... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-16 | Merge branch 'js/wrap-log' |
diff | tree |
| 2007-04-16 | send-email: do not leave an empty CC: line if no cc... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-16 | Merge branch 'maint' |
diff | tree |
| 2007-04-16 | Merge branch 'maint' |
diff | tree |
| 2007-04-15 | Change attribute negation marker from '!' to '-'. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-15 | Define a built-in attribute macro "binary". Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-15 | attribute macro support Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-15 | Makefile: add patch-ids.h back in. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-15 | Fix 'diff' attribute semantics. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-15 | Fix 'crlf' attribute semantics. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-15 | Merge git://git2.kernel.org/pub/scm/gitk/gitk into... |
diff | tree |
| 2007-04-14 | Teach 'diff' about 'diff' attribute. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-14 | Define 'crlf' attribute. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-14 | Add basic infrastructure to assign attributes to paths Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-14 | Merge branch 'maint' |
diff | tree |
| 2007-04-14 | Replace a pair of patches with updated ones for subproject... |
diff | tree |
| 2007-04-14 | Do not default to --no-index when given two directories. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-13 | Merge branch 'jc/cherry' |
diff | tree |
| 2007-04-13 | Merge branch 'maint' |
diff | tree |
| 2007-04-13 | Fix git {log,show,...} --pretty=email Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-12 | Documentation: --cherry-pick Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-12 | git-log --cherry-pick A...B Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-12 | Refactor patch-id filtering out of git-cherry and git... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-12 | Add %m to '--pretty=format:' Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-12 | Merge branch 'maint' |
diff | tree |
| 2007-04-12 | GIT 1.5.1.1 Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-11 | fsck: do not complain on detached HEAD. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-10 | Merge branch 'maint' |
diff | tree |
| 2007-04-10 | git-fetch: use fetch--tool pick-rref to avoid local... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-10 | git-fetch--tool pick-rref Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-10 | t3030: merge-recursive backend test. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-10 | merge-recursive: handle D/F conflict case more carefully. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-10 | merge-recursive: do not barf on "to be removed" entries. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-10 | Treat D/F conflict entry more carefully in unpack-trees... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-10 | t1000: fix case table. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-10 | shortlog -w: make wrap-line behaviour optional. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-09 | Merge branch 'jc/push' |
diff | tree |
| 2007-04-09 | Merge branch 'jc/merge-subtree' Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-09 | Merge branch 'js/fetch-progress' |
diff | tree |
| 2007-04-09 | Merge branch 'maint' |
diff | tree |
| 2007-04-09 | Add Documentation/cmd-list.made to .gitignore Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-08 | Start 1.5.2 cycle by prepareing RelNotes for it. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-08 | Merge branch 'jc/read-tree-df' (early part) |
diff | tree |
| 2007-04-08 | Merge branch 'maint' |
diff | tree |
| 2007-04-08 | Prepare for 1.5.1.1 Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-07 | A new merge stragety 'subtree'. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-07 | git-push to multiple locations does not stop at the... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-07 | git-push reports the URL after failing. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-07 | Merge branch 'jc/index-output' |
diff | tree |
| 2007-04-07 | Merge branch 'fp/make-j' |
diff | tree |
| 2007-04-07 | Merge branch 'cc/bisect' |
diff | tree |
| 2007-04-07 | Merge branch 'jc/checkout' (early part) |
diff | tree |
| 2007-04-07 | Merge branch 'maint' |
diff | tree |
| 2007-04-07 | Documentation: tighten dependency for git.{html,txt} Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-07 | git-bisect: allow bisecting with only one bad commit. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-07 | t6030: add a bit more tests to git-bisect Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-06 | git-bisect: modernization Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-05 | Merge branch 'maint' |
diff | tree |
| 2007-04-05 | Rename add_file_to_index() to add_file_to_cache() Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-05 | Rename static variable write_index to update_index... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-05 | Rename internal function "add_file_to_cache" in builtin... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-05 | Propagate cache error internal to refresh_cache() via... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-05 | Fix bogus error message from merge-recursive error... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-05 | Fix dependency of common-cmds.h Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | RPM spec: include git-p4 in the list of all packages. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | rerere: make sorting really stable. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | Fix switching to a branch with D/F when current branch... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | Fix twoway_merge that passed d/f conflict marker to... |
diff | tree |
| 2007-04-04 | Fix read-tree --prefix=dir/. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | unpack-trees: get rid of *indpos parameter. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | unpack_trees.c: pass unpack_trees_options structure... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | add_cache_entry(): removal of file foo does not conflict... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | Merge branch 'jc/bisect' |
diff | tree |
| 2007-04-04 | Merge branch 'fl/doc' |
diff | tree |
| 2007-04-04 | Merge branch 'post1.5.1/blame.el' |
diff | tree |
| 2007-04-04 | Merge branch 'post1.5.1/tcltk' |
diff | tree |
| 2007-04-04 | Merge branch 'post1.5.1/p4' |
diff | tree |
| 2007-04-04 | Merge branch 'lt/dirwalk' |
diff | tree |
| 2007-04-04 | git-read-tree --index-output=<file> Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | _GIT_INDEX_OUTPUT: allow plumbing to output to an alternativ... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | checkout: allow detaching to HEAD even when switching... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | GIT 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | Merge 1.5.0.7 in Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | GIT 1.5.0.7 Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-04 | rerere should not repeat the earlier hunks in later... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-02 | Hopefully final update to the draft Release Notes,... Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-04-01 | Optional Tck/Tk: ignore generated files. Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-03-30 | Do not bother documenting fetch--tool Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-03-30 | Update draft release notes for 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net> |
diff | tree |
| 2007-03-30 | Merge branch 'maint' |
diff | tree |