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
Merge branch 'jc/conflict-marker-size'
2010-01-21
J
u
n
io C Hamano
Merge branc
h
'
jc/conflic
t
-mar
k
er-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bran
c
h
'ag/maint
-
a
p
ply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
Hamano
Merg
e
branch
'
a
p
/merge-
b
a
c
k
end-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
m
a
n
o
Merge bran
c
h '
n
d/s
t
atus-parti
a
l-refresh'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
M
e
rge remote bran
c
h 'remot
e
s/
t
rast-doc/for-
n
ext'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C
Hamano
M
e
rge branch '
j
h/notes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
M
e
rge
br
a
nch 'jc/
m
aint-refre
s
h
-index-
i
s-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
Me
r
ge branch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'jc/cache-u
n
merge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
g
e
branch 'j
s
/exec-error-report
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Haman
o
Merge bra
n
c
h 'jc/l
s
-fil
e
s-ignored-
p
athspec'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Haman
o
Merge branch 'jc
/
grep-lookah
e
ad'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge
bra
n
c
h
'jc/maint-str
b
uf
-
add-fix-doubli
n
g'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge b
r
anch 'mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nc
h
'da/difftool
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh/rebase-fi
x
up'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
n
o
Merge bran
c
h 'ns/reba
s
e
-
auto-s
q
uash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh/reb
a
se-
f
ixup' (ear
l
y pa
r
t)
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
amano
Me
r
ge branch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
Merge
b
ranch 'jk/w
a
rn-
a
uth
o
r-committe
r
-
a
fter-commit'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Haman
o
Me
r
ge bran
c
h 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'tr/h
t
tp-pu
s
h-ref-statu
s
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hama
n
o
Mer
g
e branch 'bk/fix-re
l
a
t
ive-gitd
i
r-f
i
le'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
rge branch 'sd/cd-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C H
a
mano
Merge br
a
nc
h
'
jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
date
.
c
:
mark f
i
le-
l
ocal function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
S
ync with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
G
it 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Hamano
Merge branch 'bg/maint-r
e
mote-u
p
date-de
f
a
u
lt' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
M
erge b
r
an
c
h 'sb/
m
aint-oc
t
o
p
us' into
ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Ham
a
no
M
e
rge branch
'bg/maint-add-all-doc' into
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ha
m
ano
Merge br
a
nc
h
'maint-
1
.
6
.
5
' in
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
m
an
o
Git
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
M
e
rge br
a
nch
'
j
k/m
a
int
-
1
.
6
.
5-reset-hard' int
o
mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
tr/m
a
int-1
.
6
.
5
-
bash-prompt
-
show-subm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e bran
c
h 'dp/maint-1
.
6
.
5
-fast-
i
mport-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch
'
jm/mai
n
t
-1
.
6
.
5-
g
rep-NUL-ter
m
inate' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
st
a
tus: don't requi
r
e the rep
o
si
t
ory to be wri
t
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Johannes S
i
xt
M
akefile: honor NO_CURL when set
t
ing REMOTE
_
CURL_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarmi
g
an Casebolt
ident
.
c: rep
l
a
c
e
fprin
t
f with
f
p
u
ts to
suppress compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
N
g
u
y
ễ
n
Thái Ngọc Duy
rm: o
n
ly re
f
resh entries tha
t
we may
t
ouch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David Rip
t
on
bisect
:
fix singul
a
r
/
plural grammar
nit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branch '
m
aint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge br
a
n
c
h
'
maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge bran
c
h
'maint-1
.
6
.
2' into
main
t
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hama
n
o
M
e
r
g
e com
m
it
'
v1
.
6
.
4
.
4-8-g8de6518' into m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-backport of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update dra
f
t release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
m
a
n
o
Update draft release
notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ham
a
no
Merge br
a
nc
h
'dp/ma
i
nt-1
.
6
.
5-f
a
st-impo
r
t-
n
on
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Haman
o
Merge branc
h
'
j
c/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge bra
n
ch '
p
c/unintere
s
ting-
s
ubmo
d
ule-d
i
sap
p
ea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'nd/inc
l
ude-termios-for-osol
'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Hamano
M
e
rge branch 'js/windo
w
s'
commit
|
commitdiff
|
tree
2010-01-19
D
a
n
iel B
a
r
kal
o
w
Replace parse
_
blob() with
a
n exp
l
anat
o
ry comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Me
r
ge
b
ranch 'jm/mai
n
t-1
.
6
.
5-grep-
N
UL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim
Meyering
grep: NUL terminate input from
a file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Grue
n
bacher
builtin-apply
.
c
:
Sk
i
p f
i
lena
m
es
without eno
u
gh
c
o
m
ponents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c:
remo
v
e
u
nus
e
d functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
m
ano
object
.
c: remove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
D
o
cument that merge str
a
t
e
gies can now tak
e
their
o
wn
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Extend merge-subtre
e
tes
t
s to te
s
t
-
Xsub
t
ree=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "su
b
tree" part more orthogona
l
to th
e
rest
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
pull: Fix
p
arsi
n
g
of -X<
o
ption>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Te
a
ch git-pu
l
l
to
p
ass -X<option> to
git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery P
e
nnaru
n
gi
t
m
erge
-X<
o
p
tion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
U
pdate dr
a
ft release n
o
tes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
Ha
m
ano
Mer
g
e branch 'tc/t
e
st-locate-ht
t
pd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
e
r
ge branch 'jh
/
comm
i
t-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
M
e
rge branch
'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merg
e
branch
'
jc/maint-1
.
6
.
1-checkout
-
m-c
u
sto
m
-
merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge b
r
anch 'tc/
c
lone
-
v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bran
c
h 'tc/smar
t
-http-rest
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
a
n
o
Me
r
g
e br
a
nch
'jk/run
-
comman
d
-us
e
-shel
l
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge
b
r
anch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Update COPY
I
NG
w
ith GPLv2 wi
t
h new
F
SF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Hamano
user_
i
dent_suffi
c
i
ently_given(): refactor the l
o
g
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
user_ident_
s
ufficient
l
y_
g
iven(
)
:
refactor the logi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
rerere:
honor conflict
-
marker-size
attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ham
a
n
o
rerere
:
prepare for
cust
o
mizable conflict m
a
r
ker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
commit
.
c::print_summary
:
do not release
the
f
o
rmat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
c
onfli
c
t-marker-size: ne
w
attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: u
s
e ll_merge() instead of using xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
a
n
o
merge-tree: use
l
l_merg
e
()
not x
d
l_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hama
n
o
xdl_
m
erg
e
(): allow
passing d
o
wn marker
_
s
ize i
n
xmparam_
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C H
a
mano
xdl_mer
g
e(): intr
o
duce xmparam_t for merg
e
s
pecific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
gi
t
_attr(): fix fun
c
ti
o
n
s
ignatur
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Do not use date
.
c:tm_to_time
_
t() from compat/mingw
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej K
.
Haczewski
MSVC: W
i
ndow
s
-nativ
e
im
p
l
ementati
o
n for
subset o
f
Pth
r
e
ads
A
PI
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
n
o
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Ramkumar Ram
a
chandra
Documen
t
ati
o
n: Up
d
ate
git core
tu
t
orial clarifyi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ramsay
Jones
MS
V
C: F
i
x an
"i
n
c
ompatibl
e
pointer types"
c
ompil
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jo
h
annes
S
ix
t
Windows: avoid the
"
dup dance"
w
hen spa
w
ning a child
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Joha
n
nes
Six
t
Windows: simplify the
p
ipe
(
2) implementation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Joha
n
nes S
i
xt
Windows:
boost startup
by avoiding
a
sta
t
ic d
e
penden
c
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Erik F
a
ye-Lund
Win
d
ows: dis
a
bl
e
P
y
thon
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next