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 'bw/cvsimport'
2010-01-21
Junio
C Hamano
Merge br
a
nch '
b
w/cvsimport
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge br
a
nc
h
'jc/ch
e
c
kout-m
e
rge
-
base'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
amano
Merge
b
ranch 'ag/
p
at
c
h-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
M
erge bra
n
ch 'jc/confli
c
t-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
ama
n
o
Merge branch 'ag/main
t
-app
l
y
-
too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
M
erg
e
b
r
anch 'ap/me
r
g
e
-
back
e
nd-opts'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
H
amano
Me
r
g
e branch 'n
d
/
s
t
a
tu
s
-
p
artial-ref
r
esh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge remot
e
branch 'remotes/tras
t
-doc
/
f
o
r-ne
x
t'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
H
a
mano
M
e
rge bra
n
c
h 'jh/notes' (ea
r
ly part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge bran
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge
branch
'
j
c
/maint-refre
s
h-index-is-opti
o
n
al-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Hamano
Merge branch 'rr/core-tutor
i
al'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
Merg
e
bran
c
h 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
Ha
m
a
n
o
Merge b
r
a
n
ch 'js/exec-error-repor
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
M
e
r
ge branch 'jc/ls-files
-
ignored-pat
h
spec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch 'jc
/
g
r
e
p-lo
o
kahead'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
erge bra
n
c
h
'
j
c/m
a
in
t
-strbu
f
-add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
ano
Merge
branch '
m
m/conflict-a
d
vice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Mer
g
e branch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ha
m
ano
Merge
b
ranch 'm
h
/rebas
e
-
f
ix
u
p'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'ns/re
b
ase-
a
uto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch
'
mh/re
b
ase
-
fixup' (ea
r
l
y
part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Mer
g
e b
r
a
nch 'i
l
/push-set-ups
t
r
e
am'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C
H
amano
Merge b
r
anch
'
j
k/warn-au
t
hor-comm
i
tter-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
M
erge
br
a
nch 'jc/i
d
ent'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge branch '
t
r/h
t
t
p-pus
h
-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Merge branc
h
'bk/fix-relative
-
g
i
t
dir-file'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
am
a
n
o
Merge bran
c
h 'sd/cd-p-sh
o
w
-t
o
plevel'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hamano
M
erge branch 'jc/symbol-
s
tatic'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
date
.
c:
m
ar
k
file-lo
c
al function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Sync wit
h
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Mer
g
e branch 'b
g
/
m
ai
n
t-remote-up
d
ate
-
default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sb/maint-octo
p
us' into maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
M
e
r
ge
b
ranch 'b
g
/maint-add-all-doc' i
n
to maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'maint-1
.
6
.
5
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge
b
ranch 'jk/
m
aint-1
.
6
.
5-reset-hard' into
ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Mer
g
e
bra
n
ch
'
tr/m
a
int-1
.
6
.
5-bash-promp
t
-show-
s
ubmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'dp
/
maint-
1
.
6
.
5-fast-imp
o
rt-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
Merge
b
ranch
'
j
m/main
t
-1
.
6
.
5
-
g
r
ep-NUL-
t
erm
i
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
n
o
F
ix "checkout A
.
.
.
" syno
n
ym fo
r
"checkout A
.
.
.
HEA
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
sta
t
us: d
o
n't requi
r
e the
r
epository to be wri
t
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
o
hannes Sixt
M
akefi
l
e: ho
n
o
r NO_CURL when
s
ett
i
ng REMOTE
_
C
URL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
T
a
r
miga
n
Ca
s
ebolt
ident
.
c
:
replace fprintf with fputs to suppress compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễ
n
Thái
Ngọc Du
y
rm: on
l
y
refresh ent
r
ies that we may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
avid Ripton
b
isect: fix s
i
ngu
l
a
r/plural grammar
nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n
Walton
cvsimport: s
t
anda
r
ize system
(
)
c
a
l
ls to e
x
ternal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben W
a
lton
cvsimport: standarize open(
)
calls to external git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Be
n
Walton
cvsimport: modernize call
o
uts to git sub
c
ommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge bran
c
h
'
m
aint-1
.
6
.
4
'
into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
mano
Merge branch 'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branc
h
'maint-
1
.
6
.
2
' in
t
o m
a
int-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge c
o
m
m
it 'v1
.
6
.
4
.
4-8-g8de6518
'
i
n
to
main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
F
ix mis-ba
c
k
port of
t
7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ha
m
ano
Update d
r
aft rele
a
se n
o
tes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Update draft relea
s
e notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C H
a
mano
Merge branch
'
d
p/maint-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Haman
o
Me
r
g
e
bra
n
ch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'pc/uninteresting-s
u
bmodule-disappe
a
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
aman
o
Merge b
r
a
n
ch
'
n
d/in
c
lude-t
e
r
m
ios-for-oso
l
'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hama
n
o
Mer
g
e b
r
a
nch 'js/w
i
nd
o
ws'
commit
|
commitdiff
|
tree
2010-01-19
Andre
a
s Gru
e
n
b
acher
builtin
-
ap
p
ly
.
c
: fix the --- and +++
h
ea
d
er filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Danie
l
B
a
rka
l
ow
Replac
e
parse_blob() with a
n
e
xplanatory
c
omm
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ha
m
a
n
o
Merge branch 'jm/maint-1
.
6
.
5-grep
-
NUL-ter
m
ina
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
i
m M
e
y
ering
grep
:
NU
L
terminate input from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gruenbac
h
er
b
u
il
t
in-apply
.
c: Skip filenames with
o
ut enoug
h
co
m
ponents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
syml
i
nks
.
c
:
remove
unused 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 u
n
used functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Docum
e
nt that merge strategies can no
w
take their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y
Pennar
u
n
Extend merge-
s
u
btre
e
tests to test
-
X
subtree=d
i
r
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
ni
o
C Hamano
Make
"
subtr
e
e" p
a
r
t
more orthogo
n
al to
the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix parsing of -
X
<op
t
ion>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
en
n
ar
u
n
Teach
g
i
t-
p
ull to pass
-X<option> to git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
ver
y
P
ennarun
git merge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Upd
a
te dra
f
t release n
o
tes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge bran
c
h 'tc/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
e
r
ge
branch '
j
h/comm
i
t-status'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge
b
ranc
h
'jn/
m
akefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'j
c
/
maint-1
.
6
.
1
-che
c
kout-
m
-cust
o
m-merg
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge branch 't
c
/
c
lone-v-
p
rog
r
e
ss'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Mer
g
e branch 'tc/smart-http-
r
est
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Me
r
ge
bra
n
ch 'jk/run-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'sr/gfi-
o
ptions'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
U
p
da
t
e CO
P
YING with GPLv2 with
n
e
w
FSF addre
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
user_
i
dent_su
f
fici
e
ntly
_
g
iven
(
)
: ref
a
ctor the
l
o
g
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
user_iden
t
_suffi
c
i
e
ntly
_
given():
r
efactor the
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
rerere: honor conflict-marker-size attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
rerere: prepare
for cust
o
miz
a
ble conflict ma
r
k
e
r
length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C H
a
mano
commit
.
c
:
:print_
s
ummar
y
:
do not
release th
e
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
co
n
flict-ma
r
ker
-
siz
e
:
new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
rerere:
use
ll_merg
e
() i
n
st
e
ad of u
s
ing xdl_merge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
merge-tree:
use l
l
_merge()
not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
xdl_merg
e
(): allo
w
passing down marker_size in
x
m
p
aram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
xdl_merge(): introd
u
ce x
m
param_t
f
or merge
s
pecific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
git_attr
(
): fix function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jo
h
annes Sixt
Do not
u
s
e date
.
c
:tm_to_time_t() from
c
om
p
at/mingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej K
.
Hacze
w
s
ki
MSVC: Windows-nat
i
ve
i
mplementat
i
on for sub
s
et of
P
threads
A
PI
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next