?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Make git-merge-one-file a builtin
2007-11-11 Johannes SchindelinMake git-merge-one-file a builtin
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-11 Johannes SchindelinAdd a test for git-merge-one-file
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-11 Johannes SchindelinAdd remove_leading_directories()
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-11 Johannes Schindelindebug settings in Makefile
 commit | commitdiff | tree
2007-11-10 Johannes Schindelinbuiltin-blame: set up the work_tree before the first...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-09 Johannes Schindelinrebase: operate on a detached HEAD
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-08 Johannes SchindelinDeprecate git-lost-found
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-08 Johannes SchindelinAdd Documentation/CodingGuidelines
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-06 Johannes Schindelinbuiltin-reset: avoid forking "update-index --refresh"
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-06 Johannes Schindelinbuiltin-reset: do not call "ls-files --unmerged"
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-06 Johannes Schindelinparse-options: abbreviation engine fix.
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-05 Johannes SchindelinSplit off the pretty print stuff into its own file
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-11-04 Johannes Schindelingit-reset: do not be confused if there is nothing to...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-30 Johannes Schindelinparse-options: Allow abbreviated options when unambiguous
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-30 Johannes SchindelinAdd tests for parse-options.c
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-21 Johannes SchindelinDeduce exec_path also from calls to git with a relative...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-17 Johannes SchindelinTeach "git reflog" a subcommand to delete single entries
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-17 Johannes Schindelinfilter-branch: update current branch when rewritten
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-17 Johannes Schindelinfix filter-branch documentation
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-17 Johannes SchindelinFix setup_git_directory_gently() with relative GIT_DIR...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-16 Johannes Schindelinfetch: if not fetching from default remote, ignore...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-16 Johannes Schindelincvsexportcommit: get rid of temporary directory
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-16 Johannes SchindelinFix compilation when NO_CURL is defined
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-16 Johannes SchindelinSupport cvs via git-shell
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-16 Johannes Schindelinrebase -i: use diff plumbing instead of porcelain
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-16 Johannes Schindelinclear_commit_marks(): avoid deep recursion
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-02 Johannes SchindelinFix typo in config.txt
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-10-01 Johannes Schindelinfetch/push: readd rsync support
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-30 Johannes SchindelinIntroduce remove_dir_recursively()
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-30 Johannes Schindelinrebase -i: squash should retain the authorship of the...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-30 Johannes Schindelinrebase -i: support single-letter abbreviations for...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-26 Johannes Schindelinapply: get rid of --index-info in favor of --build...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-26 Johannes Schindelinrebase -i: work on a detached HEAD
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-26 Johannes Schindelinrebase -i: avoid exporting GIT_AUTHOR_* variables
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-26 Johannes Schindelinrebase -i: Fix numbers in progress report
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-26 Johannes Schindelinrebase -i: style fixes and minor cleanups
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-26 Johannes Schindelinrebase -i: commit when continuing after "edit"
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-19 Johannes SchindelinAdd bundle transport
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-19 Johannes SchindelinMove bundle specific stuff into bundle.[ch]
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-19 Johannes Schindelinapply: get rid of --index-info in favor of --build...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-17 Johannes Schindelinapply --index-info: fall back to current index for...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-15 Johannes Schindelinrevision walker: --cherry-pick is a limited operation
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-03 Johannes Schindelinverify-tag: also grok CR/LFs in the tag signature
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-03 Johannes SchindelinTeach "git remote" a mirror mode
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-01 Johannes Schindelinfilter-branch: introduce convenience function "skip_commit"
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-01 Johannes Schindelinfilter-branch: provide the convenience functions also...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-01 Johannes Schindelinrebase -i: mention the option to split commits in the...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-09-01 Johannes Schindelinfilter-branch: fix remnants of old syntax in documentation
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-29 Johannes Schindelincompletion: also complete git-log's --left-right and...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-28 Johannes Schindelinname-rev: Fix non-shortest description
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-23 Johannes Schindelinrebase -i: fix squashing corner case
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-10 Johannes SchindelinReinstate the old behaviour when GIT_DIR is set and...
...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-05 Johannes Schindelincheckout-index needs a working tree
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-03 Johannes Schindelinread-tree: remove unnecessary call to setup_git_directory()
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-02 Johannes Schindelinrebase -i: fix for optional [branch] parameter
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-02 Johannes Schindelinrebase -i: ignore patches that are already in the upstream
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-01 Johannes Schindelinget_relative_cwd(): clarify why it handles dir == NULL
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-01 Johannes SchindelinClean up work-tree handling
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-01 Johannes SchindelinAdd set_git_dir() function
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-01 Johannes SchindelinAdd functions get_relative_cwd() and is_inside_dir()
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-08-01 Johannes SchindelinAdd is_absolute_path() and make_absolute_path()
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-30 Johannes Schindelinwhite space fixes in setup.c
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-27 Johannes Schindelinrebase -i: fix interrupted squashing
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-27 Johannes SchindelinTeach "git stripspace" the --strip-comments option
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-26 Johannes Schindelinrebase -i: fix overzealous output redirection
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-25 Johannes Schindelingit am: skip pine's internal folder data
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-25 Johannes SchindelinTeach approxidate() to understand "never"
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-25 Johannes Schindelingit log -g: Complain, but do not fail, when no reflogs...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-24 Johannes SchindelinTeach revision machinery about --no-walk
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-24 Johannes Schindelinfilter-branch: Big syntax change; support rewriting...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-24 Johannes Schindelinrebase -i: exchange all "if [ .. ]" by "if test .."
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-24 Johannes SchindelinShut "git rebase -i" up when no --verbose was given
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-24 Johannes Schindelinmailinfo: fix 'fatal: cannot convert from utf-8 to...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-22 Johannes Schindelinfsck --lost-found: write blob's contents, not their...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-21 Johannes Schindelinlaunch_editor(): Heed GIT_EDITOR and core.editor settings
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-21 Johannes Schindelinrebase -i: call editor just once for a multi-squash
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-19 Johannes Schindelinfilter-branch: get rid of "set -e"
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-11 Johannes Schindelinbranch --track: code cleanup and saner handling of...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-11 Johannes SchindelinAdd for_each_remote() function, and extend remote_find_track...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-11 Johannes SchindelinFix --cherry-pick with given paths
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-11 Johannes SchindelinFix core.sharedRepository = 2
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-10 Johannes Schindelinrerere: record resolution even if file is not in merge...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-09 Johannes Schindelinrebase -i: put a nice warning into the todo list
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-09 Johannes Schindelinrebase -i: remember the settings of -v, -s and -p when...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-09 Johannes Schindelinrebase -i: actually show the diffstat when being verbose
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-09 Johannes Schindelinrebase -i: handle --continue more like non-interactive...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-09 Johannes Schindelinbranch.autosetupmerge: allow boolean values, or "all"
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-07 Johannes SchindelinFix "apply --reverse" with regard to whitespace
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-07 Johannes Schindelingit-branch: default to --track
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-07 Johannes SchindelinEnable "git rerere" by the config variable rerere.enabled
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-06 Johannes SchindelinTeach git-stash to "apply --index"
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-06 Johannes SchindelinFuture-proof source for changes in xdemitconf_t
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-06 Johannes Schindelinfilter-branch: fail gracefully when a filter fails
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-06 Johannes Schindelinfilter-branch documentation: clarify which filters...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-04 Johannes Schindelinfilter-branch: a few more touch ups to the man page
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-04 Johannes Schindelinfilter-branch: make output nicer
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-04 Johannes Schindelinfilter-branch: add a test for the commit removal example
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-04 Johannes SchindelinAdd diff-option --ext-diff
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-04 Johannes SchindelinDocument git-filter-branch
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2007-07-03 Johannes Schindelinglossary: add 'reflog'
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
next
Dscho's miscellaneous git branches