Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Teach git-remote to list pushed branches.
[gitweb.git]
/
merge-recursive.c
2007-03-20
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2007-03-18
Merge 1.5.0.5 in from 'maint'
blob
|
diff
|
raw
2007-03-17
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-14
Merge GIT 1.5.0.4
blob
|
diff
|
raw
2007-03-14
Merge branch 'jc/fetch'
blob
|
diff
|
raw
2007-03-14
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2007-03-13
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-12
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-12
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-03-12
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-11
Merge branch 'js/diff-ni'
blob
|
diff
|
raw
2007-03-11
Merge branch 'js/revert-cherry'
blob
|
diff
|
raw
2007-03-11
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-08
Merge branch 'js/config-rename'
blob
|
diff
|
raw
2007-03-07
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-06
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-06
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-03-06
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-06
Merge branch 'master-for-junio' of git://repo.or.cz...
blob
|
diff
|
raw
2007-03-05
Merge branch 'maint'
blob
|
diff
|
raw
2007-03-05
Merge branch 'js/fetch-progress' (early part)
blob
|
diff
|
raw
2007-03-05
Merge branch 'js/symlink'
blob
|
diff
|
raw
2007-03-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-03-04
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-03-04
Handle core.symlinks=false case in merge-recursive.
blob
|
diff
|
raw
2007-03-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-03-02
Merge branch 'js/commit-format'
blob
|
diff
|
raw
|
diff to current
2007-03-02
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-02-28
Merge branch 'js/commit-by-name'
blob
|
diff
|
raw
|
diff to current
2007-02-28
Merge branch 'js/bundle'
blob
|
diff
|
raw
|
diff to current
2007-02-28
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-02-28
Merge branch 'np/types'
blob
|
diff
|
raw
|
diff to current
2007-02-28
Merge branch 'mc/sendmail'
blob
|
diff
|
raw
|
diff to current
2007-02-27
Merge branch 'np/types' into jc/fetch
blob
|
diff
|
raw
|
diff to current
2007-02-27
convert object type handling from a string to a number
blob
|
diff
|
raw
|
diff to current
2007-02-26
Merge branch 'master' into js/diff-ni
blob
|
diff
|
raw
|
diff to current
2007-02-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-02-26
Merge branch 'jc/merge-symlink' into maint
blob
|
diff
|
raw
|
diff to current
2007-02-26
merge-recursive: fix longstanding bug in merging symlinks
blob
|
diff
|
raw
|
diff to current
2007-02-25
Merge git://repo.or.cz/git-gui into maint
blob
|
diff
|
raw
|
diff to current
2007-02-21
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2007-02-18
Merge git://git./pub/scm/gitk/gitk into maint
blob
|
diff
|
raw
|
diff to current
2007-02-14
Merge branch 'js/reverse'
blob
|
diff
|
raw
|
diff to current
2007-02-14
Merge branch 'jc/diff-apply-patch'
blob
|
diff
|
raw
|
diff to current
2007-02-14
Merge branch 'jc/merge-base' (early part)
blob
|
diff
|
raw
|
diff to current
2007-02-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-02-13
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2007-02-12
Merge git-gui
blob
|
diff
|
raw
|
diff to current
2007-02-08
Merge branch 'master' of git://repo.or.cz/git/fastimport
blob
|
diff
|
raw
|
diff to current
2007-02-07
Merge branch 'master' of git://repo.or.cz/git/fastimport
blob
|
diff
|
raw
|
diff to current
2007-02-07
Merge branch 'master' of git://repo.or.cz/git/fastimport
blob
|
diff
|
raw
|
diff to current
2007-02-05
Use pretend_sha1_file() in git-blame and git-merge...
blob
|
diff
|
raw
|
diff to current
2007-02-04
Merge branch 'master' into np/dreflog
blob
|
diff
|
raw
|
diff to current
2007-02-04
Keep untracked files not involved in a merge.
blob
|
diff
|
raw
|
diff to current
2007-02-04
Assorted typo fixes
blob
|
diff
|
raw
|
diff to current
2007-01-31
Merge branch 'master' of git://linux-nfs.org/~bfields/git
blob
|
diff
|
raw
|
diff to current
2007-01-30
Merge branch 'master' into sp/gfi
blob
|
diff
|
raw
|
diff to current
2007-01-15
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2007-01-15
Merge branch 'master' of git://git./git/git
blob
|
diff
|
raw
|
diff to current
2007-01-14
Convert output messages in merge-recursive to past...
blob
|
diff
|
raw
|
diff to current
2007-01-14
Display a progress meter during merge-recursive.
blob
|
diff
|
raw
|
diff to current
2007-01-14
Enable output buffering in merge-recursive.
blob
|
diff
|
raw
|
diff to current
2007-01-14
Allow the user to control the verbosity of merge-recursive.
blob
|
diff
|
raw
|
diff to current
2007-01-14
Remove unnecessary call_depth parameter in merge-recursive.
blob
|
diff
|
raw
|
diff to current
2007-01-14
Merge branch 'sp/merge' (early part)
blob
|
diff
|
raw
|
diff to current
2007-01-14
Merge branch 'master' into sp/fast-import
blob
|
diff
|
raw
|
diff to current
2007-01-12
merge-recursive: do not report the resulting tree objec...
blob
|
diff
|
raw
|
diff to current
2007-01-12
Merge branch 'jc/bare'
blob
|
diff
|
raw
|
diff to current
2007-01-12
Merge branch 'ar/merge-recursive'
blob
|
diff
|
raw
|
diff to current
2007-01-12
Merge branch 'jc/detached-head'
blob
|
diff
|
raw
|
diff to current
2007-01-10
merge-recursive: do not use on-file index when not...
blob
|
diff
|
raw
|
diff to current
2007-01-10
Speed-up recursive by flushing index only once for...
blob
|
diff
|
raw
|
diff to current
2007-01-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-01-08
Merge branch 'jc/reflog'
blob
|
diff
|
raw
|
diff to current
2007-01-08
short i/o: fix calls to write to use xwrite or write_in...
blob
|
diff
|
raw
|
diff to current
2007-01-07
Merge branch 'sp/mmap'
blob
|
diff
|
raw
|
diff to current
2007-01-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2007-01-01
Merge branch 'sp/merge' (early part)
blob
|
diff
|
raw
|
diff to current
2006-12-29
Allow merging bare trees in merge-recursive.
blob
|
diff
|
raw
|
diff to current
2006-12-29
Move better_branch_name above get_ref in merge-recursive.
blob
|
diff
|
raw
|
diff to current
2006-12-27
Merge branch 'master' into js/shallow
blob
|
diff
|
raw
|
diff to current
2006-12-27
Merge branch 'jc/fsck-reflog'
blob
|
diff
|
raw
|
diff to current
2006-12-25
Merge branch 'jc/skip-count'
blob
|
diff
|
raw
|
diff to current
2006-12-25
Merge branch 'jc/git-add--interactive'
blob
|
diff
|
raw
|
diff to current
2006-12-24
Merge branch 'sb/merge-friendly'
blob
|
diff
|
raw
|
diff to current
2006-12-23
Display 'theirs' branch name when possible in merge.
blob
|
diff
|
raw
|
diff to current
2006-12-23
Use extended SHA1 syntax in merge-recursive conflicts.
blob
|
diff
|
raw
|
diff to current
2006-12-22
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-21
Merge branch 'ew/svn-pm'
blob
|
diff
|
raw
|
diff to current
2006-12-20
Merge branch 'jc/leftright'
blob
|
diff
|
raw
|
diff to current
2006-12-20
Merge branch 'jc/blame'
blob
|
diff
|
raw
|
diff to current
2006-12-20
Merge branch 'jc/branch-remove-remote'
blob
|
diff
|
raw
|
diff to current
2006-12-20
Merge branch 'jc/clone'
blob
|
diff
|
raw
|
diff to current
2006-12-20
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-20
simplify inclusion of system header files.
blob
|
diff
|
raw
|
diff to current
2006-12-19
Use preprocessor constants for environment variable...
blob
|
diff
|
raw
|
diff to current
2006-12-18
Merge branch 'jn/web' (early part)
blob
|
diff
|
raw
|
diff to current
2006-12-14
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2006-12-14
Merge branch 'jc/diff--cached'
blob
|
diff
|
raw
|
diff to current
next