repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
conflict-marker-size: add test and docs
2010-01-21
Junio C Hamano
conflict-mark
e
r-size: ad
d
t
e
s
t and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
U
pdat
e
dr
a
ft releas
e
notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
aman
o
Me
r
ge branch
'b
w
/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
M
e
r
ge
branch 'jc/checkout-me
r
g
e
-ba
s
e'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge b
r
anch 'a
g
/patch
-
heade
r
-ver
i
fy
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge
b
ra
n
ch 'j
c
/c
o
nflict-marker-s
i
ze'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
M
e
rge branch 'ag/ma
i
n
t-apply-too-large
-
p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge bra
n
ch 'ap/merge-backe
n
d-opts'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ham
a
no
Merge branch 'nd/statu
s
-part
i
a
l
-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge r
e
m
ote br
a
nch
'
remot
e
s/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C
Ha
m
a
no
Merge branch
'jh/
n
otes' (early
part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
Hamano
Me
r
ge
b
ranch '
j
c/maint-refresh
-
index-
i
s-opt
i
onal-
f
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'rr/core-t
u
t
o
r
i
al'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
ma
n
o
Merge branc
h
'jc/cache-unmerg
e
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
ano
Merge
branch 'js/exec-
e
rr
o
r-
r
eport'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
jc/ls-files-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge bran
c
h '
j
c/grep-l
o
okahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'jc
/
m
ai
n
t-strbuf-
a
dd-fix
-
doubling'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Merge
b
ranch 'mm/con
f
lict-advice'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'da
/
difft
o
ol'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge br
a
nch 'ns/reba
s
e
-
auto-sq
u
ash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge b
r
an
c
h
'mh/rebase-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'il/push-set-u
p
str
e
am'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
a
n
c
h
'jk/war
n
-author-committer-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
ge branch
'
jc/
i
dent'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'tr/http-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nc
h
'bk/fix-relativ
e
-gitdi
r
-
f
ile'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
M
erge branch 'sd/cd-p-
s
h
ow-topleve
l
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merg
e
branch 'jc/s
y
m
bo
l
-st
a
t
ic'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
da
t
e
.
c
: m
a
rk f
i
le-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Sync w
i
th 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge bran
c
h 'bg/maint-remote
-
update-default' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch
'
sb/main
t
-octopus' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
ano
M
e
rge br
a
nch 'bg/
m
a
i
n
t
-add-all-doc' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'maint-1
.
6
.
5' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
e
r
ge branch
'
jk
/
maint-1
.
6
.
5-
r
eset-h
a
r
d' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'tr/
m
aint-1
.
6
.
5-bash-
p
rompt-show-sub
m
odule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge bra
n
ch 'dp/maint-1
.
6
.
5-f
a
s
t-imp
o
rt-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Merg
e
br
a
nc
h
'jm/mai
n
t
-1
.
6
.
5
-
gr
e
p
-NUL
-
t
e
r
mi
n
ate' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
F
ix "checkout A
.
.
.
" sy
n
onym for "c
h
ecko
u
t A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status: don
'
t re
q
uire the re
p
osito
r
y to be
w
r
itable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
oha
n
nes Sixt
Makefile: ho
n
or
N
O_C
U
RL when setting REMOTE_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Cas
e
bol
t
i
d
ent
.
c: re
p
l
a
ce fprin
t
f wi
t
h fputs to suppress compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ng
u
yễn
Thái Ngọc Duy
rm: only r
e
fresh entries that
w
e may to
u
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David R
i
p
to
n
bis
e
ct: fix singu
l
ar/pl
u
ral grammar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n Walt
o
n
cv
s
import
:
standari
z
e
syste
m
(
)
calls to ex
t
ernal gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wa
l
ton
c
v
simport: standarize open() calls to
e
x
t
e
rn
a
l git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cv
s
import: mod
e
rnize
callout
s
t
o
git subcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge branch
'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge branc
h
'mai
n
t-
1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
amano
M
e
rge commit 'v1
.
6
.
4
.
4-8-g
8
de6518' into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C H
a
mano
Fix mis-backport
o
f t700
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ham
a
n
o
Update draft release notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
no
Mer
g
e branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Update d
r
a
f
t
release notes to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Mer
g
e b
r
anch 'dp/mai
n
t-1
.
6
.
5-fa
s
t-
i
mpor
t
-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hama
n
o
Merg
e
bra
n
ch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge b
r
a
nc
h
'pc/uninte
r
e
s
t
ing-sub
m
o
d
u
le-disapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
Haman
o
Merge branch '
n
d/
i
nclude-termio
s
-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
A
n
d
re
a
s Gruenbacher
builtin-apply
.
c: fix the --- and ++
+
he
a
der filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Barkalow
Replac
e
p
arse_blob() with an explan
a
tory
c
om
m
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Ham
a
no
Merge
b
r
a
nch 'jm/maint-1
.
6
.
5-grep-NUL-
t
erm
i
nat
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim
M
eyering
g
rep
:
NUL terminat
e
input from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andr
e
as Grue
n
bacher
builtin-apply
.
c: Skip filena
m
es wit
h
out
e
n
ough components
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
un
i
o C Hamano
s
y
ml
i
nks
.
c
:
remove unuse
d
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
ni
o
C
Hamano
object
.
c: rem
o
ve
unused function
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
D
o
cume
n
t th
a
t merge
s
tr
a
t
egies ca
n
now t
a
ke th
e
ir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennaru
n
Exte
n
d me
r
g
e
-
subt
r
ee tests
t
o test -Xsubtree=di
r
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Ham
a
no
Make "subtre
e
" part
more o
r
thogona
l
to the r
e
st of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
pul
l
: Fix parsing of
-
X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Aver
y
Penn
a
run
Teach git-p
u
l
l
t
o
pass
-
X
<
option> to git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
git merg
e
-X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
i
o C Hamano
Update draft rele
a
se notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
am
a
no
Me
r
g
e branch 'tc
/
t
est-l
o
cate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
i
o C H
a
mano
Merg
e
branc
h
'jh/co
m
m
i
t
-s
t
atus'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge b
r
a
n
c
h 'j
n
/
makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Mer
g
e
branch 'jc/maint-1
.
6
.
1-chec
k
ou
t
-m-custom-me
r
g
e'
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C
Hamano
Merge b
r
anch 'tc/clone-v-
p
rogress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge branch
'tc/
s
mart-http-r
e
strict'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
Me
r
g
e
branc
h
'jk/run-comm
a
nd-use-sh
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge branc
h
'
s
r
/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hama
n
o
Up
d
a
te COPY
I
NG wi
t
h GPLv2 w
i
t
h
new
F
SF addres
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Haman
o
user_ident_sufficiently_given(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
user_ident_su
f
f
i
ciently_given(
)
: r
e
factor
th
e
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
rere
r
e:
h
ono
r
confl
i
c
t-
m
arker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
rerere: prepare for
custom
i
zab
l
e
conf
l
ict ma
r
k
e
r
lengt
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c
:
:print_
s
ummary:
do
n
ot relea
s
e
t
he for
m
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hama
n
o
co
n
f
lict-marker-size:
new
a
ttribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: u
s
e
l
l
_
m
erge()
inst
e
ad o
f
u
sing xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
merge-tree:
u
se ll_merge() not xdl_
m
er
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Haman
o
xdl_
m
er
g
e(): allo
w
passing down mar
k
er_size in
x
m
p
a
ram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): introdu
c
e x
m
param_t for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_
a
t
tr():
fix
f
unction signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next