aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | xmerge.c: minimum readability fixupsJunio C Hamano2008-08-30
| * | | | | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
| * | | | | xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano2008-08-30
* | | | | | Add contrib/rerere-train scriptNanako Shiraishi2008-09-29
* | | | | | mingw: remove use of _getdrive() from lstat/fstatDmitry Potapov2008-09-29
* | | | | | compat/mingw: Support a timeout in the poll emulation if no fds are givenJohannes Sixt2008-09-29
* | | | | | usage.c: remove unused functionsNanako Shiraishi2008-09-29
* | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-26
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove empty directories in recursive mergeAlex Riesen2008-09-26
| * | | | | Documentation: clarify the details of overriding LESS via core.pagerChris Frey2008-09-26
* | | | | | Cleanup remove_pathAlex Riesen2008-09-26
* | | | | | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \
| * | | | | | builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-06
| * | | | | | merge-recursive: get rid of virtual_idMiklos Vajna2008-09-05
| * | | | | | merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-04
| * | | | | | merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-04
| * | | | | | merge-recursive: get rid of the index_only global variableMiklos Vajna2008-09-04
| * | | | | | merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-03
| * | | | | | cherry-pick/revert: make direct internal call to merge_tree()Miklos Vajna2008-09-02
| * | | | | | builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna2008-08-30
| * | | | | | merge-recursive: introduce merge_optionsMiklos Vajna2008-08-30
| * | | | | | merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-30
| * | | | | | Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-30
* | | | | | | Merge branch 'jc/alternate-push'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \
| * | | | | | | push: receiver end advertises refs from alternate repositoriesJunio C Hamano2008-09-09
| * | | | | | | push: prepare sender to receive extended ref information from the receiverJunio C Hamano2008-09-09
| * | | | | | | receive-pack: make it a builtinJunio C Hamano2008-09-09
| * | | | | | | is_directory(): a generic helper functionJunio C Hamano2008-09-09
* | | | | | | | Merge branch 'am/status'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \
| * | | | | | | | wt-status: Teach how to discard changes in the working directoryAnders Melchiorsen2008-09-07
| * | | | | | | | wt-status: Split header generation into three functionsAnders Melchiorsen2008-09-07
* | | | | | | | | Merge branch 'pb/autocorrect-wrapper'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git wrapper: also use aliases to correct mistyped commandsPieter de Bie2008-09-11
* | | | | | | | | | Merge branch 'mv/commit-tree'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7603: add new testcases to ensure builtin-commit uses reduce_heads()Miklos Vajna2008-09-10
| * | | | | | | | | | builtin-commit: use commit_tree()Miklos Vajna2008-09-10
| * | | | | | | | | | commit_tree(): add a new author parameterMiklos Vajna2008-09-10
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/apply-include-exclude'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-apply:--include=pathspecJunio C Hamano2008-09-06
* | | | | | | | | | | Merge branch 'jc/safe-c-l-d'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | safe_create_leading_directories(): make it about "leading" directoriesJunio C Hamano2008-09-03
* | | | | | | | | | | | gitweb: shortlog now also obeys $hash_parentGiuseppe Bilotta2008-09-25
* | | | | | | | | | | | Merge branch 'ho/dirstat-by-file'Shawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff --dirstat-by-file: count changed files, not linesHeikki Orsila2008-09-05
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge git://repo.or.cz/git-guiShawn O. Pearce2008-09-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-gui: Reenable staging unmerged files by clicking the icon.Alexander Gavrilov2008-09-24
| * | | | | | | | | | | | git-gui: Support the encoding menu in gui blame.Alexander Gavrilov2008-09-24
| * | | | | | | | | | | | git-gui: Optimize encoding name resolution using a lookup table.Alexander Gavrilov2008-09-24
| * | | | | | | | | | | | git-gui: Allow forcing display encoding for diffs using a submenu.Alexander Gavrilov2008-09-24
| * | | | | | | | | | | | git-gui: Add a menu of available encodings.Alexander Gavrilov2008-09-24