repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Document that merge strategies can now take their own options
2010-01-18
Junio C Hamano
Docu
m
e
nt tha
t
merge strategies
c
an n
o
w take their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subtree"
p
art more
o
rth
o
gonal to the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix
p
a
r
sing
o
f
-
X<opt
i
on>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
git-
m
erge-file --ou
r
s, --their
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Ham
a
no
M
e
rge remote branch 'ko/master' into HEAD
commit
|
commitdiff
|
tree
2009-11-28
Junio C Ha
m
ano
Update draft re
l
ea
s
e notes
t
o 1
.
6
.
6 before merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-11-27
J
unio C Hama
n
o
builtin
-
a
p
ply
.
c: pay attention to -p<n> when
d
e
t
er
m
inin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio C
Haman
o
Merge branch 'rs
/
work-arou
n
d-grep-opt-ins
a
nity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merg
e
branc
h
'rj/maint-
c
ygwin-
c
ount-obj
e
cts'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
i
o C
Hamano
Merge branch 'rs/color-
e
scap
e
-has-zero-widt
h
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
Hamano
Merge bra
n
ch
'bg/apply-doc
'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Haman
o
Merge branch 'm
m
/m
a
int-hint-failed-merge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
Merge branch
'
j
c/log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge br
a
nch '
m
r/g
i
t
w
eb-snapshot'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
Mer
g
e bran
c
h 'cc
/
r
ep
l
ace'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hama
n
o
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
P
r
otect scripted
P
or
c
ela
i
ns from GREP_O
P
TIONS insanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Hamano
A
dd
t
riv
i
al tests for --std
i
n
o
ptio
n
t
o
log
family
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C
Hamano
Merge branch 'bg/fetch-
m
u
l
ti'
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
io C
H
amano
Git v1
.
6
.
6-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
M
e
r
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C Hama
n
o
Merg
e
git://gi
t
.
bogomips
.
org/git-
s
vn
commit
|
commitdiff
|
tree
2009-11-23
Junio C H
a
mano
Merge branch '
t
h/maint-remote-
u
pdate-help-string'
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
io
C
Ham
a
no
Merge branch 'jn/faster-completion-startup'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Hamano
Mer
g
e branch
'
r
j
/maint-t9700'
commit
|
commitdiff
|
tree
2009-11-23
Junio C H
a
mano
Merge branc
h
'ls/maint-mailinfo-no-inbody'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Hamano
Me
r
ge br
a
nch 'mo/maint-crlf-doc'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
M
erge branch '
t
h/remote-usage'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Haman
o
Me
r
ge branch '
p
b/main
t
-use
-
c
us
t
o
m-perl'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Hamano
Merge branch 'mm/config-pa
t
hname-tilde-expand'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
H
am
a
no
Merge branch 'bc/
g
rep-
i
-F'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
Mer
g
e bran
c
h 'jk/mai
n
t-bre
a
k-rename-reduce-memory'
commit
|
commitdiff
|
tree
2009-11-23
J
unio C
Haman
o
Merg
e
b
r
anch 'tc/format-attribute'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Ham
a
n
o
Me
r
ge branc
h
'
t
r/maint-
m
erge-o
u
rs-clarification' (ea
r
ly
.
.
.
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Hamano
Documentat
i
on:
a
vo
i
d
xmlto input error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branch 'jc/fi
x
-t
r
ee
-
walk' (
e
a
rly
p
art)
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
M
erge b
r
anch 'jh/notes' (early pa
r
t
)
commit
|
commitdiff
|
tree
2009-11-21
Ju
n
io C
H
am
a
no
Merge branch
'sp/smart-h
t
tp
'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branch 'bw/autoconf-more'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hama
n
o
Merge b
r
anch 'j
n
/editor-pager'
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o C Hama
n
o
Merge branch 'r
j
/cygw
i
n-msvc'
commit
|
commitdiff
|
tree
2009-11-21
Junio C
H
a
m
a
no
Merge branch
'r
j
/maint-simplify-cygwi
n
-makefile
'
commit
|
commitdiff
|
tree
2009-11-21
Junio C
H
aman
o
Merge branch
'bg/fo
r
m
a
t-patch-doc-up
d
a
t
e'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
H
a
mano
M
erge branch 'tr/filter-branch
'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ha
m
ano
Merge branch 'sc/protocol
-
doc'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ham
a
no
Merge
branch 'jl/submodul
e
-add-noname'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ham
a
no
Merge branc
h
'
s
b/l
s
-tree-
p
arseopt'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
M
e
rge branch
'rg/
d
oc-work
f
l
o
w
'
commit
|
commitdiff
|
tree
2009-11-21
J
unio C
Ha
m
ano
Me
r
ge
branch 'jn/gitweb-log-histo
r
y'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
M
erge branch
'
jn/help-
e
verywhere'
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o
C
Hamano
Merge branch 'j
p
/
fet
c
h-c
u
l
l-many
-
r
efs'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Haman
o
diffcore-rename: reduce memory f
o
otprint by freei
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Junio C Hamano
Make --s
t
din option to "log"
family re
a
d a
l
so pathspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Jun
i
o
C Haman
o
setup_revisions():
do not call get_pathspec() too early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Junio C Hamano
T
each --st
d
in option to "log
"
family
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-20
Junio C Hamano
re
a
d_revision
_
fr
o
m_stdin():
use
strb
u
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-18
Jun
i
o C H
a
mano
Me
r
ge branch 'np/m
a
int-sid
e
band-favor
-
st
a
tu
s
'
commit
|
commitdiff
|
tree
2009-11-18
Junio
C
H
a
m
ano
Merge branch 's
b
/tutorial-tes
t
'
commit
|
commitdiff
|
tree
2009-11-18
Jun
i
o
C Hamano
Merg
e
branch 'ef/msys-imap'
commit
|
commitdiff
|
tree
2009-11-17
Junio
C
H
a
m
ano
M
e
r
ge git://git
.
b
o
g
o
mips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
amano
Update draft release note
s
to 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio
C
H
a
mano
Sy
n
c with 1
.
6
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Ham
a
no
Git 1
.
6
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge b
r
anch
'
b
s/maint-
p
r
e
-comm
i
t-
h
oo
k
-
s
a
mpl
e
' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C H
a
mano
Merge
b
ran
c
h 'jk/
m
a
i
n
t-add-p-empty'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C
H
amano
Merge
br
a
nch 'j
s
/mai
n
t-diff-c
o
lor-
w
o
rds' into
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C H
a
mano
Merge bra
n
c
h 'tz/maint-r
p
m' int
o
m
a
in
t
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Ham
a
no
Merge branch 'jk/m
a
int-f
o
rmat-patch
-
p-suppre
s
s-stat
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio
C H
a
mano
Merge branch
'
pb/m
a
int-
g
i
tweb-blob-line
n
o
'
into maint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hamano
M
e
rge branch 'jk/
m
a
int-1
.
6
.
3-ls-files-i
'
into maint
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C Hamano
Merge
branch 'vl/maint-openssl-
s
ignature-cha
n
ge' into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Mer
g
e
b
r
anch 'jk/maint-pu
s
h
-
c
onfig' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merg
e
branch 'sr
/
blame-in
c
omplete' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ham
a
no
M
e
rg
e
branch 'jc/maint-
b
lank-at-eof' i
n
to maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hama
n
o
M
e
r
g
e bra
n
ch 'bs/maint-
p
r
e
-
c
ommit-hook-sam
p
le'
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge
branch
'
js/maint-diff-col
o
r-words'
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
M
erge branch 'rs/pretty-wrap'
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ham
a
no
Me
r
ge
b
ranch 'js/l
o
g-rewrap'
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C
Hamano
Merge branch 'fc/do
c
-f
a
s
t
-
f
orward'
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
a
mano
Merge branch 'sc/difftool-p
4
merge'
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
H
a
ma
n
o
Merge b
r
anch 'jk/main
t
-ad
d
-p-empty'
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C
H
amano
Merge bra
n
ch
'
lt/revision-bisect'
commit
|
commitdiff
|
tree
2009-11-16
J
u
n
io
C
Haman
o
Me
r
ge branch
'
jc/m
a
int-1
.
6
.
3-graft-trail
i
ng-space'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C
Hamano
Merge branch 'tr/maint
-
roff-quote'
i
n
to main
t
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C Hamano
M
e
rge b
r
anch 'ja/f
e
tc
h
-doc' into
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge b
r
anch 'cb/doc-fetch-pull-merge' i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
erge
branch 'jk/m
a
int-
c
vsimport-p
a
thname' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
a
ma
n
o
Mer
g
e branch
'jc/receiv
e
-pack
-
auto' into m
a
i
nt
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 'gb/maint
-
g
itweb
-
esc-par
a
m' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 'jn/gitweb-pat
c
h'
into maint
commit
|
commitdiff
|
tree
2009-11-15
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-11-13
Junio C
H
amano
Provid
e
a build time default-
p
ag
e
r setti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-11
Junio C H
a
m
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-11-11
Junio C Hamano
chec
k
-ref-format -h: i
t
d
o
es
n
ot know
t
h
e -
-
print
o
ption
y
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-10
Junio C
H
amano
git-descri
b
e
.
txt: fo
r
matting fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-10
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-11-10
Junio C H
a
m
ano
Merge
bran
c
h 'jk/ma
i
nt-
f
ormat-patch-p-suppress-stat'
commit
|
commitdiff
|
tree
2009-11-10
Junio C Ha
m
ano
Merge
b
ranch 'pb/maint
-
g
itw
e
b-bl
o
b-lineno'
commit
|
commitdiff
|
tree
next