repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2008-09-09
Junio C Haman
o
pu
s
h: prepare sender to receive
extend
e
d
r
ef
i
nformat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-09
Junio
C
Hama
n
o
receive-pack: m
a
ke it
a builtin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-09
Junio C H
a
mano
is_di
r
ectory(): a generic helper
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-08
Junio C Hamano
Merge git:
/
/git
.
bogomips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2008-09-08
Junio C H
a
mano
Merge branch
'
a
r
/autospell'
commit
|
commitdiff
|
tree
2008-09-08
Jun
i
o C Ha
m
ano
Merge bra
n
ch 'jc/cc-
l
d-dynpath'
commit
|
commitdiff
|
tree
2008-09-08
Junio C Hamano
Merge branch
'jc/hide-cr-in
-
diff-from-less'
commit
|
commitdiff
|
tree
2008-09-08
Jun
i
o C Hamano
Merge branc
h
'jc/m
a
int-chec
k
o
u
t
-fix'
commit
|
commitdiff
|
tree
2008-09-07
Junio C
Ha
m
ano
D
on't verify host name in SS
L
certs
w
hen GIT_S
S
L_NO
_
VE
R
IFY
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hama
n
o
daemon
.
c:
avoid s
e
t
l
i
nebuf()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hamano
Upd
a
te draft
r
e
lease
n
o
t
es for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
J
uni
o
C
Hamano
Mer
g
e
g
it://git
.
bogomips
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2008-09-07
Junio
C
Hamano
d
i
ff
-
-quiet: mak
e
it syno
n
ym to --exit-code
>
/
d
e
v
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hamano
diff Porcelain: do no
t
dis
a
ble auto in
d
ex refr
e
s
h
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
J
unio
C
Hamano
git-apply
:
--
i
nclude=pathspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-07
Junio C Hama
n
o
Merg
e
updated
g
it-gu
i
and
git
k
that call eac
h
other
commit
|
commitdiff
|
tree
2008-09-06
Ju
n
io
C
Ha
m
ano
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2008-09-06
Junio
C Hamano
Update
d
raf
t
release notes
for 1
.
6
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-06
J
un
i
o C Hamano
stash: re
f
r
esh
t
h
e
i
ndex bef
o
re d
e
ci
d
i
ng if the work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-06
J
unio C Haman
o
Merge branch
'
m
a
int' of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Jun
i
o C Hamano
Men
t
ion the fact that 'git
annotate' is
o
nly fo
r
backw
a
r
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-05
J
unio C Hamano
"
b
lame -c"
should
b
e compatibl
e
with "annotate"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-05
Junio
C
Hamano
Merge b
r
anch 'jc/maint-log-grep'
commit
|
commitdiff
|
tree
2008-09-05
Junio C Hamano
log --author/-
-
committer: re
a
lly match only with name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-04
Junio C Haman
o
diff
-
-cumu
l
ati
v
e is a
sub-
o
pt
i
on of --dirstat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-04
J
u
nio C
H
amano
safe_
c
reate_leading_
d
i
r
ectories()
:
make it
about "leading
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Update
draft release
n
otes
for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-03
Junio C
H
amano
Merge branch '
m
a
i
n
t'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Ham
a
no
Star
t
1
.
6
.
0
.
2 m
a
intenance cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-03
J
u
n
io C Hamano
Merge bra
n
ch 'nd/wo
r
ktree'
into main
t
commit
|
commitdiff
|
tree
2008-09-03
Junio C Hamano
Merge b
r
anch 'ho/dashless' into m
a
int
commit
|
commitdiff
|
tree
2008-09-03
J
u
nio C H
a
mano
Merge branch 'tr/filter-
b
ran
c
h'
commit
|
commitdiff
|
tree
2008-09-03
Ju
n
i
o
C
H
a
mano
Merge br
a
nch 'np/maint-safer-pack'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C Hamano
M
e
rge branch 'r
f
/man-env'
commit
|
commitdiff
|
tree
2008-09-03
Juni
o
C Ha
m
ano
Merge br
a
nch 'jc/author-nickname'
commit
|
commitdiff
|
tree
2008-09-03
Junio C Ha
m
ano
M
e
rge bran
c
h
'
dp/pid-uin
t
max'
commit
|
commitdiff
|
tree
2008-09-03
Junio C H
a
m
a
no
Me
r
ge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2008-09-03
Junio
C Hamano
Merge branch 'np/ma
i
nt
-
safe
r
-
pack' into np/pac
k
commit
|
commitdiff
|
tree
2008-09-01
Junio C
H
amano
git-merge documentation: describe how confli
c
t i
s
p
r
esented
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-01
Junio C Hamano
checkout --conflict=<style>: recrea
t
e merge
in a n
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-01
Junio
C
Hamano
Merge branch
'
tr
/
rev-lis
t
-docs' into
tr/filter-br
a
nch
commit
|
commitdiff
|
tree
2008-08-31
J
unio C Hamano
Merg
e
branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
am
a
no
g
i
t-add -
-
inten
t
-to-add (-N)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
'git foo' p
r
ogram iden
t
ifies
itself
without dash
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Hama
n
o
git
co
m
mit --a
u
t
h
or=$nam
e
: look
$
na
m
e
up in existing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ha
m
ano
diff
:
vary default prefix depending o
n
what are compar
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C Hamano
diff: Help "less" hid
e
^
M
from the o
u
tput
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
git
a
t
t
ributes:
-
c
r
l
f is not bin
a
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C H
a
mano
ch
e
ckout -m: recreate me
r
ge
w
hen checking ou
t
o
f unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Ham
a
n
o
Merge b
r
anch 'j
c
/maint-checkout-fix' in
t
o 'jc/b
e
tt
e
r
.
.
.
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C
Hamano
g
i
t-me
r
ge-recursive: learn t
o
hono
r
mer
g
e
.
conflic
t
style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C
H
am
a
no
merge
.
conflic
t
st
y
le: choose between
"merge
"
and "diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio
C Ham
a
no
rerere: understand "diff3 -m" s
t
y
l
e conflicts with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio
C Hamano
rere
r
e
.
c
: use sy
m
bolic constants
to keep
t
ra
c
k of pa
r
sing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hama
n
o
x
merg
e
.
c: "d
i
ff3 -m" style clips m
e
rge r
e
duction lev
e
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xmerg
e
.
c: mini
m
u
m rea
d
ab
i
lity
f
i
x
ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
xd
i
ff-merge:
optionally sh
o
w con
f
lict
s
in "diff3 -m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
aman
o
xdl_fill_merge_buffer(
)
: sepa
r
ate
o
ut
a
too
d
e
ep
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
checkou
t
--ours/--theirs:
allow checking ou
t
one side
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C
H
amano
checkout -f: all
o
w ignoring
unmerged pat
h
s whe
n
che
c
king
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C Hamano
check
o
ut: do not c
h
ec
k
out unmer
g
ed higher
stages ran
d
omly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch 'jc/post-simplify' (early part) into tr
.
.
.
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hama
n
o
git-
a
pply: L
o
os
e
n "m
a
tch_beginning" l
o
gic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C Hamano
Fix example in g
i
t-name-rev documen
t
ati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
aman
o
Merge branch 'sp/miss
i
ng-thin-bas
e
' into maint
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io
C Hamano
Merge branch
'
sb/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ham
a
n
o
Merge br
a
nch 'af
/
mai
n
t-install-no-handlink' into mai
n
t
commit
|
commitdiff
|
tree
2008-08-30
J
u
ni
o
C
H
amano
shell: do not play
duplicated definition
games to shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge b
r
anch 'np
/
v
eri
f
y-pack' into maint
commit
|
commitdiff
|
tree
2008-08-29
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Haman
o
Merge branc
h
'm
v
/merg
e
-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Haman
o
Merge branch 'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
H
amano
Merge branch '
a
m/cherry-pi
c
k
-
rerere'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
Merge branch 'jc
/
add-add
r
emove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Haman
o
M
e
rge
branch 'np
/
veri
f
y-p
a
ck'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'da/sub
m
odule-s
y
nc
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
M
e
rge
b
ranch
'main
t
'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C
Hamano
ct
y
pe
.
c: protec
t
tin
y
C
prepro
c
e
ssor cons
t
ants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Ha
m
an
o
Mer
g
e br
a
nc
h
'af/main
t
-install-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
Hamano
Merge branc
h
'jc/no-slim-shel
l
'
commit
|
commitdiff
|
tree
2008-08-27
J
u
n
i
o C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-26
Ju
n
io C Hamano
daemon
.
c:
m
inor style fi
x
up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>:
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ju
n
io
C
Haman
o
Revert "Build-in "git-shell""
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io
C
Hamano
Merg
e
bran
c
h 'j
c
/no-slim-shel
l
'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge b
r
an
c
h 'maint' to sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Ha
m
ano
Mer
g
e branch 'a
g
/maint
-
co
m
bine
-
di
f
f
-
fix
'
into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Mer
g
e branch '
m
v/maint
-
merg
e
-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
J
unio C
H
am
a
no
t760
6
:
f
i
x custom me
r
ge
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ham
a
no
Merge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
merge: fix
n
umerus
bugs arou
n
d "trivia
l
merge" area
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unp
a
c
k
_trees(): pro
t
ect the handcrafted in-co
r
e i
n
d
ex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Junio C Ha
m
ano
disc
a
r
d_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 Hamano
templates/Makefile:
i
nsta
l
l is unnecessary, just use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Merge bra
n
c
h
'ml
/
submodule-f
o
reach'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C
H
amano
Merge br
a
nch 'pm/log-exit-cod
e
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
r
ge branc
h
'sb/commit-tree
-
min
i
l
eak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
no
Mer
g
e br
a
nc
h
'
p
b/reflog-
d
wi
m
'
commit
|
commitdiff
|
tree
next