repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t5303: work around printf breakage in dash
2008-09-10
Junio
C
Hamano
c
heckout: do
not lose staged
removal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C Hamano
F
i
x permission bits on sources chec
k
ed out with a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C Ha
m
a
n
o
pus
h
: r
e
ceiver end advertises
r
efs
f
r
om
alternate repositor
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C Hamano
p
u
sh: pre
p
are se
n
der to rec
e
iv
e
extended ref
i
n
formation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
J
unio
C Hama
n
o
rec
e
ive-
p
ack: m
a
ke it a
builtin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-09
Junio C
H
amano
i
s
_directory(): a generic helper functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-08
Junio C Ham
a
no
M
e
rge git://git
.
b
ogom
i
ps
.
org/git-svn
commit
|
commitdiff
|
tree
2008-09-08
Junio
C
Hamano
M
erge bra
n
c
h
'
ar/au
t
ospell'
commit
|
commitdiff
|
tree
2008-09-08
Junio C H
a
mano
Merge branch
'jc/cc
-
ld-d
y
npat
h
'
commit
|
commitdiff
|
tree
2008-09-08
J
u
nio
C
Hamano
Merge bran
c
h 'jc/h
i
de-cr-in
-
d
i
ff-from-less'
commit
|
commitdiff
|
tree
2008-09-08
J
u
nio C
H
amano
Merge
branch '
j
c/maint-c
h
eckout-fix'
commit
|
commitdiff
|
tree
2008-09-07
Jun
i
o C Hama
n
o
Don't verify h
o
s
t
n
a
me in
SSL c
e
rts w
h
en GIT_SSL_NO_VERIFY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
J
unio C
H
a
mano
daemon
.
c
: avoid setline
b
u
f
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hamano
Update
d
r
a
ft release note
s
for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Haman
o
M
e
r
ge gi
t
://g
i
t
.
b
ogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hamano
diff --q
u
iet: make it synon
y
m to --exit-co
d
e >/dev
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Junio C
H
ama
n
o
d
i
ff P
o
rcelain: do not d
i
sa
b
le au
t
o i
n
dex
r
efreshi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Juni
o
C Ham
a
no
git-apply:--include=pa
t
hspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-07
Juni
o
C Ham
a
no
Merge updat
e
d git-gui a
n
d gitk
t
ha
t
call eac
h
other
commit
|
commitdiff
|
tree
2008-09-06
Junio C Ham
a
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-09-06
Junio
C
Hamano
Update d
r
aft release
notes for 1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
J
u
ni
o
C
Hamano
st
a
sh: refr
e
sh th
e
ind
e
x before deciding if the
w
ork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-06
Junio C Hamano
Merge branch 'ma
i
nt' of
git://repo
.
or
.
cz/g
i
t-
g
u
i
into
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Junio
C Hama
n
o
Men
t
ion the fa
c
t
that 'g
i
t anno
t
ate'
is
only for
back
w
ar
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Ju
n
io
C
H
a
m
ano
"b
l
a
m
e
-
c"
should
b
e co
m
p
a
t
ible wit
h
"
a
nnotate"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Junio C Ha
m
an
o
Merge branch 'jc/m
a
int
-
l
o
g-
g
rep'
commit
|
commitdiff
|
tree
2008-09-05
Juni
o
C Haman
o
log
-
-author/--c
o
mmitter: reall
y
match only with name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
Juni
o
C H
a
mano
diff
--cumula
t
i
v
e
is
a sub-option of -
-
dirstat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-04
J
un
i
o C Hamano
safe
_
create_leading_di
r
e
ctories():
m
ak
e
it about "leadin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Jun
i
o C H
a
ma
n
o
Update draft releas
e
notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
M
e
r
g
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C
Hamano
Start 1
.
6
.
0
.
2 m
a
inte
n
ance cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
io C Hamano
M
e
r
ge branch 'nd/wo
r
k
tree
'
in
t
o maint
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C Hamano
M
e
rge b
r
anch 'h
o
/d
a
shless' into maint
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge branch
'tr/f
i
lter-branch'
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
io C
H
a
m
ano
Mer
g
e br
a
nch 'np/
m
aint-safer-pack'
commit
|
commitdiff
|
tree
2008-09-03
J
u
nio
C
Ham
a
no
Merge bra
n
ch 'rf/m
a
n
-en
v
'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C Hamano
Merge branch 'jc/auth
o
r-nicknam
e
'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Haman
o
Merge branch 'dp/pid-uin
t
max'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-09-03
J
u
n
io C Hama
n
o
Merge branch 'np/maint-sa
f
er-pack
'
into np
/
pack
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
git-merge documentation: de
s
cribe
how conflic
t
is
present
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
checkout --conflict=
<
style>:
r
ec
r
eate mer
g
e in a non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
Merge branch 'tr/rev-list-docs' into
tr/fil
t
er-br
a
nc
h
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Haman
o
git-add --intent-to-add
(
-N)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
'git f
o
o'
progr
a
m identifies itself without dash in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
git
c
ommit --author=$name: l
o
ok $name up
i
n existing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
an
o
dif
f
:
va
r
y defau
l
t pre
f
ix depending on wha
t
are co
m
pared
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Hamano
diff: Help "les
s
" hide
^M
f
rom the
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gita
t
tr
i
butes
:
-crlf is not
binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Ham
a
n
o
che
c
kout -m: recre
a
t
e mer
g
e when checking
o
ut of unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Haman
o
Merge branch 'jc/maint-checkout-
f
ix'
int
o
'jc/bet
t
er
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Ha
m
ano
git-m
e
rg
e
-
r
ec
u
rsive: learn to honor
merge
.
co
n
fl
i
ct
s
tyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
me
r
g
e
.
c
o
n
flictstyle: choose be
t
w
e
en "merge" and "
d
i
ff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Haman
o
r
e
r
e
re
:
u
n
der
s
tand "diff3 -m"
style conflicts
w
i
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
rerere
.
c: use symb
o
l
ic c
o
nst
a
nts to keep track of parsing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xmerge
.
c:
"diff3 -m" style c
l
ips merge re
d
uction level
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
n
o
xmer
g
e
.
c:
minimum rea
d
ability fixups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xdiff-merge: optionally
s
how c
o
nfl
i
cts in "dif
f
3
-m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
Hamano
xdl
_
fill_
m
erge_
b
uffer(): s
e
parat
e
out a to
o
deep
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o
C Hamano
checkout --ours/--t
h
e
i
rs: all
o
w checking
out one side
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C
Hamano
checkout
-
f
:
allow ign
o
ring un
m
erged p
a
th
s
when checking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C H
a
man
o
chec
k
ou
t
:
do not
check out u
n
merged hi
g
h
er
s
tages random
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C Hamano
M
e
rge
b
ran
c
h 'jc/post
-
simpl
i
fy' (early part) int
o
tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C
Ha
m
ano
git-apply: Loose
n
"
match_begi
n
nin
g
"
l
o
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
uni
o
C
Hamano
F
ix exampl
e
in git-name-rev documentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
a
mano
Merge branch 's
p
/missing-th
i
n-base' into
maint
commit
|
commitdiff
|
tree
2008-08-30
J
u
ni
o
C
Hamano
Me
r
ge bran
c
h 's
b
/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch 'af/mai
n
t-install
-
no-
h
an
d
link' into main
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
shell:
d
o not play d
u
plicated
d
e
finition game
s
to sh
r
i
n
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge br
a
nch 'np
/
verify-pack'
i
n
to maint
commit
|
commitdiff
|
tree
2008-08-29
J
unio C Ha
m
a
no
Mer
g
e
bra
n
ch
'm
a
int'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
M
e
rg
e
b
ranch 'mv/
m
erge-c
u
stom
'
commit
|
commitdiff
|
tree
2008-08-28
Jun
i
o C Hamano
Merge br
a
nch
'
m
l/sub
m
o
dule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge
branch 'am/cher
r
y-
p
i
c
k-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch '
j
c/
a
d
d-addr
e
move'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Ham
a
no
Merge branch 'n
p
/veri
f
y
-pack'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Haman
o
Merge b
r
anch 'da/su
b
module-
s
ync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
Me
r
g
e
branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
ct
y
pe
.
c:
p
rotect tin
y
C
p
reprocessor
c
onstants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C
Hamano
Merg
e
b
r
a
nch 'af/m
a
int-
i
nstall-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Haman
o
Merge
b
r
a
nch 'j
c
/no
-
slim-she
l
l
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-26
Jun
i
o C Ha
m
ano
daemon
.
c
: minor style fixu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C H
a
mano
R
ever
t
"Build
-
in
"git-s
h
ell""
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Haman
o
Merge branch 'jc/n
o
-
s
lim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio C
H
amano
Merge branch 'maint' to sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge b
r
anch '
a
g/mai
n
t-combine-d
i
ff-fi
x
' i
n
to maint
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C
Hamano
Merge branch 'mv/
m
aint-me
r
ge-fix' i
n
to maint
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C H
a
m
ano
t7606: fix custom merge t
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Haman
o
Merge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Ha
m
ano
merge: fix numerus bu
g
s aro
u
nd "trivial merge" ar
e
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unpa
c
k_trees():
p
rote
c
t
t
he ha
n
dcraft
e
d i
n
-core
index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Junio C
Hamano
discard_cache: reset lazy name_hash bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Ju
n
io C Hama
n
o
templa
t
es/Makefile:
i
nstall i
s
unnece
s
sary, just
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
i
o C
H
amano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch
'
ml/sub
m
odule-fo
r
each'
commit
|
commitdiff
|
tree
next