repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jh/maint-config-file-prefix'
2010-01-20
Ju
n
io
C Ham
a
no
Merge
b
ranch
'
jk/warn-author-commi
t
ter-
a
fter-commi
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o
C
Haman
o
Merge branch
'
jc/
i
d
e
nt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch
'
t
r
/http-pu
s
h-re
f
-s
t
atus'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Haman
o
Merge br
a
nch 'b
k
/
f
ix-relative-git
d
ir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branc
h
'
s
d
/
cd-p-show-top
l
ev
e
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
m
ano
Merge br
a
nch 'jc/
s
ym
b
ol-static'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Ha
m
ano
date
.
c: mark file-local
function st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Sync
with
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'b
g
/
m
aint-
r
emote-update-defau
l
t'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branc
h
'
s
b
/
maint
-
octopus' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
man
o
Merge branch
'bg/ma
i
nt-
a
d
d-all-doc' i
n
to maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch '
m
ain
t
-
1
.
6
.
5
'
into maint
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
Ilari L
i
usvaara
r
e
v-parse --b
r
anch
e
s/--tags/-
-
r
e
m
o
tes=pattern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
I
la
r
i Lius
v
aar
a
re
v
-p
a
rse --glob
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
ama
n
o
M
e
r
ge
br
a
nch
'
j
k
/maint-1
.
6
.
5
-reset-hard' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'tr/m
a
i
n
t-1
.
6
.
5-bash-pro
m
pt-show-submodul
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Mer
g
e br
a
n
c
h
'dp/maint-1
.
6
.
5-fast-import-n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge
b
ranch 'jm/main
t
-1
.
6
.
5-gr
e
p-NU
L
-
t
erminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Teach
@
{upstr
e
am} synt
a
x to strbuf_bran
c
h
a
nme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hama
n
o
t150
6
: more t
e
s
t
fo
r
@{
u
pstream} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Fix
"
checkout A
.
.
.
" s
y
nonym for "
c
hec
k
out
A
.
.
.
H
EAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
s
tatus: don't require
t
he reposito
r
y
t
o be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-01-19
Joha
n
nes Sixt
M
a
kefile: honor NO_
C
URL when setting REMOTE_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tar
m
ig
a
n C
a
sebo
l
t
i
d
ent
.
c: replace fprintf with fput
s
to suppre
s
s c
o
mpiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
N
g
uyễn Thái
N
gọc Duy
rm: only
refr
e
sh entr
i
es that we
m
ay to
u
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
a
vid Ripton
bisect:
fix singul
a
r/pl
u
ral gramm
a
r ni
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wa
l
ton
cvsimport
:
s
tandarize s
y
stem(
)
calls to ex
t
ernal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
c
v
sim
p
or
t
: standarize open() ca
l
ls
t
o extern
a
l git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cv
s
imp
o
rt: moder
n
ize
c
allouts to git subcomma
n
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C
Ha
m
ano
M
e
rge branch 'ma
i
nt-
1
.
6
.
4'
i
nto
maint-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
maint-1
.
6
.
3' int
o
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Ham
a
no
Merge branch '
m
aint-
1
.
6
.
2' in
t
o mai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit '
v
1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C Hamano
Fix mis
-
backport of t
7
00
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Up
d
ate draft release
n
o
t
es to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Haman
o
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
pdate dr
a
ft relea
s
e notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
branch 'd
p
/m
a
i
nt-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hama
n
o
Merg
e
b
r
anch 'jc/rere
r
e'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
M
e
rge branch 'pc/u
n
interesti
n
g-sub
m
odule-disappea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge bran
c
h 'nd/include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Me
r
ge
b
ranch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Matthieu
Mo
y
b
r
a
n
ch
:
warn and ref
u
se to set a branch
as a trackin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jens
L
e
hmann
Pe
r
fo
r
m
a
n
c
e
optim
i
za
t
ion
for detec
t
i
on
of m
o
dified
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ilari L
i
usvaara
A
d
d branch --set
-
ups
t
r
e
am
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Andreas G
r
uenbacher
builtin-ap
p
l
y
.
c
: f
i
x the
--- a
n
d
+
++ header filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ilari Liusvaara
Add git remote set-url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Dan
i
el Barkalow
Replace parse_blob() with an explan
a
t
or
y
comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C H
a
m
ano
Mer
g
e
branch 'jm
/
ma
i
nt-1
.
6
.
5-gre
p
-NUL
-
te
r
mina
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyering
g
r
ep:
N
UL t
e
r
m
inate input from
a
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gru
e
nbacher
builtin-apply
.
c: Skip fil
e
names without enough com
p
o
n
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
i
o
C Hamano
symlin
k
s
.
c
:
remove unuse
d
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
object
.
c: re
m
o
v
e unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
Document that
m
er
g
e
s
trat
e
gies
c
a
n n
o
w take thei
r
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
E
x
tend m
e
rge-subtree tests
t
o test -Xsubtree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "sub
t
ree" part more orthogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
i
o
C Haman
o
pu
l
l: Fix parsing of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
v
ery Penn
a
run
Teach git-pull to pass -X
<
o
p
tion
>
to git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pe
n
narun
git merge -
X
<optio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
mano
Up
d
at
e
d
raft release notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge b
r
anch 't
c
/test-locate-
h
tt
p
d
'
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
M
erge branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
M
e
rge branc
h
'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge b
r
anch '
j
c/m
a
i
nt-1
.
6
.
1-checkout-m-cu
s
tom-merge
'
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C
Hamano
Merge bra
n
ch
'
t
c
/clone-v-pr
o
g
ress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge b
r
anch 'tc/sma
r
t-http-rest
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C H
a
mano
Me
r
ge branch
'
jk/run-command-use
-
shell'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge branch 'sr/
g
fi-op
t
ions
'
commit
|
commitdiff
|
tree
2010-01-17
Jens Leh
m
ann
git status: Show
u
ncommi
t
ted submodule
c
h
a
n
ges to
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
Update COPYING
w
i
th GPLv2
w
ith new FSF a
d
dress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_suf
f
iciently_give
n
()
:
re
f
actor the log
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Hamano
u
s
er_id
e
nt_
s
uf
f
i
c
i
ently_given(): re
f
actor
t
he lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Ham
a
no
rerer
e
:
honor
c
o
n
flict
-
marke
r
-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C H
a
mano
re
r
er
e
: prepare
f
or customiza
b
le conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
commit
.
c
:
:
p
r
int_sum
m
ary: do not
rele
a
se
t
he format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
conflict
-
m
a
r
ker-siz
e
: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: use ll_merg
e
() instead of using
x
d
l_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
merge
-
tree:
u
s
e ll_merg
e
() no
t
xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Haman
o
xdl_merge():
allo
w
p
a
ssing down marke
r
_s
i
ze in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
xdl_merge(): introduce xmparam_t fo
r
me
r
ge
s
pecifi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr():
f
ix function signatu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johanne
s
Sixt
Do not
u
se
date
.
c:tm_to_
t
ime_t() from com
p
a
t/
m
ingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej K
.
Haczewsk
i
M
SVC:
W
indow
s
-native
i
mp
l
ement
a
tion for subs
e
t of Pth
r
eads API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge branch 'cc/reset
-
more'
commit
|
commitdiff
|
tree
2010-01-17
Ramku
m
ar Rama
c
h
a
n
dra
Documentation: Updat
e
git co
r
e tuto
r
ial
c
larifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ramsay
J
o
nes
MSVC: Fi
x
an "incompatible pointer types" compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johanne
s
Sixt
Windows: a
v
oi
d
the
"dup dance" when
s
pawn
i
ng
a child
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Windows: simplify the pipe(2) imple
m
en
t
at
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Joha
n
nes Sixt
Windows: boost st
a
rtu
p
by a
v
o
i
ding a s
t
a
t
ic dep
e
ndency
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Erik Faye-Lund
Windows: d
i
sable Py
t
ho
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Teach diff that mod
i
f
ied submodule dir
e
cto
r
y is dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jens
Lehmann
Show
s
ubmodul
e
s as modi
f
ied when th
e
y cont
a
i
n a dir
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ila
r
i Liu
s
vaara
Add push --set-upstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Christian Couder
t711
1
:
fix bad HEAD in tests w
i
t
h
unme
r
ged entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
i
d
A
g
u
ilar
diff
t
ool: Update copyright not
i
ces to list each yea
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
R
ichard Weinbe
r
ger
Fix uninitializ
e
d vari
a
bl
e
in get_ref
s
_via_rsync()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next