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 'jc/fixdiff'
2006-02-12
Junio
C Ha
m
ano
M
erge b
r
a
n
ch 'jc/fixdiff'
commit
|
commitdiff
|
tree
2006-02-12
Jun
i
o C
H
amano
Avoid using "gi
t
-va
r
-l" unti
l
i
t
g
ets fixed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-12
Ju
n
io C H
a
mano
d
iff-tree: do n
o
t default to -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-12
Junio
C Hamano
t5500: a
d
j
ust to c
h
ange in pack-object rep
o
rting
b
eha
v
iou
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-12
Jun
i
o C Hamano
Only
call git-re
r
ere i
f
$
G
IT_DIR/rr
-
cac
h
e exists
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-12
Junio C Hamano
fetc
h
-clone
p
r
ogress:
finishing touches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-11
Jun
i
o C Haman
o
D
e
fin
e
GI
T
_(A
U
THOR|COMM
I
T
TER)_(NAME|EMAIL) to
kn
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-11
Junio C Hamano
Merge branch 'lt/dif
f
-tree'
commit
|
commitdiff
|
tree
2006-02-11
Junio C Hamano
git-commit -v: have pa
t
ch at t
h
e
end
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-10
Junio C
Hamano
rev-list: def
a
ul
t
t
o ab
b
reviate merge parent na
m
es
.
.
.
commit
|
commitdiff
|
tree
2006-02-10
Junio C Hamano
Me
r
ge
b
ranch 'jc/empty-commit'
commit
|
commitdiff
|
tree
2006-02-10
Junio
C Hamano
combine-di
f
f: Record
d
iff stat
u
s a bit more
faith
f
ull
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-10
Junio C
H
aman
o
f
i
n
d
_uniqu
e
_
a
bbre
v
(
) simplifi
c
ati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-10
J
unio
C
Hamano
git-s
t
a
t
u
s
-v
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-10
Junio C Hama
n
o
Merge branch 'jc/ls-files-o
'
commit
|
commitdiff
|
tree
2006-02-10
Junio
C Ha
m
ano
co
u
nt-delta
.
c
:
Match
t
h
e
de
l
ta data sema
n
ti
c
s change
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-09
Junio C Hamano
comb
i
ne-diff:
m
o
ve format
t
ing l
o
gi
c
to show_combined_diff(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-09
J
unio C Hamano
call git_co
n
fig()
a
fter setup_git_directory
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-09
Jun
i
o
C Hamano
combined-
d
iff:
u
s
e
dif
f
c
ore before intersecting
p
a
ths
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-09
J
u
nio C Haman
o
l
s
-f
i
les: honour per-dir
e
ctory ignore
file f
r
om higher
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-09
Junio C
Ha
m
ano
t6000: fix a
c
areless test
l
ibra
r
y
a
dd-on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-09
Ju
n
io C Hamano
Do not allow empty
n
a
me o
r
e
m
a
i
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-07
J
unio C Hamano
M
erge git://git
.
kernel
.
o
r
g/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-02-07
Junio C
H
amano
g
i
t-commit: finishing touch
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-07
Junio C
Hamano
gi
t
-commit:
r
evamp the git-c
o
mmit semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-07
Juni
o
C Hamano
g
it-rerere: reuse recorded reso
l
v
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-07
J
un
i
o C
H
am
a
no
fm
t
-mer
g
e-msg
:
show su
m
ma
r
y of what is m
e
rged
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-07
Junio C Hamano
read-tree --ag
g
ressive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-07
J
u
nio
C
H
a
man
o
[PATCH] mailinfo: reset
C
TE
after
each multipart
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-07
Junio C Hamano
c
ombine-diff:
do not pu
n
t on remove
d
o
r ad
d
ed fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
J
u
nio C Hamano
com
b
i
n
e-diff: show mod
e
ch
a
nges as
w
ell
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
J
u
nio C Hamano
combine-d
i
ff: do
n
o
t send NULL
to printf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
J
unio
C H
a
mano
c
ore-tu
t
orial: adjust to recen
t
reality
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hama
n
o
g
it
-
diff: do
not fall back on --cc
w
h
en
-
[123],
-
-ours
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hamano
Merge branch 'jc/diff'
commit
|
commitdiff
|
tree
2006-02-06
Ju
n
i
o
C
Hamano
Merge branches 'lt/sho
w
' and 'lt/revli
s
t'
commit
|
commitdiff
|
tree
2006-02-06
Ju
n
io C Ha
m
ano
Merg
e
branches
'jc/da
e
mon' and 'mw/http'
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hamano
git-diff-tree --stdin
:
sho
w
all pa
r
ents
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
Jun
i
o
C
H
amano
c
ombi
n
e-diff: rem
o
ve misgui
d
ed
--show-empty h
a
ck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Ham
a
no
dae
m
on: extend
user-r
e
l
ative pat
h
not
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
Junio C H
a
mano
daemo
n
:
d
o
n
ot f
o
r
b
i
d
u
ser
rel
a
tive paths uncondit
i
onally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hamano
git-show
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
J
un
i
o
C
H
a
man
o
git-diff: use --c
c
inst
e
a
d
of -p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hamano
dif
f
-
index:
m
ake --c
c
a synonym for -p for now
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-05
Junio C Hamano
Do no
t
f
a
ll back on vi on
dum
b
t
e
rm
i
nals
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-04
Junio C Hamano
Merge b
r
anches 'jc/sha1
'
, 'j
c
/diff' and 'jc/
w
s'
commit
|
commitdiff
|
tree
2006-02-04
Junio
C H
a
m
a
no
git-merge: Properly quote $merg
e
_msg var
i
a
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-03
Junio C Haman
o
get_sha1_1
:
all
o
w
octopus^12 t
o
be
p
rop
e
rly parsed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-03
Juni
o
C Hamano
whitespace cleanup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-03
J
u
n
io
C
Hama
n
o
combine-diff: fini
s
hing touches
to
g
it-diff-tre
e
--
c
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-03
Junio C Hama
n
o
combine-diff: cleanup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-03
Junio C Hamano
c
o
mbine-diff: show parent line numbers as
well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-03
Junio C Hamano
combine-diff: add
a b
i
t
m
o
r
e commen
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-03
Junio C Haman
o
commi
t
.
c
:
"Merge" fix
i
n pretty_print_commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-02
Junio
C
Hamano
Documentation: git
-
diff-tr
e
e
--cc also
omits empty
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-02
Junio C Hama
n
o
combine-di
f
f: fix placement of
deletion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-02
Junio
C Ham
a
no
combine
-
diff:
add safety chec
k
to --cc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-02
J
u
nio
C
H
a
man
o
comb
i
ne-dif
f
: upd
a
te --cc "u
n
i
nteresti
n
g hunks" lo
g
ic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-02
Ju
n
i
o C Hamano
c
ombine-
d
iff: reuse dif
f
from
t
he same blob
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-02
Junio C Hama
n
o
rev
-
list:
omit du
p
licated paren
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-02-02
Junio
C Hama
n
o
update
-
index --index-
i
n
fo: a
l
l
ow stag
e
0 entri
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-31
Juni
o
C Ham
a
no
M
e
rge branches 'bf/doc
'
a
nd 'db/tartree'
commit
|
commitdiff
|
tree
2006-01-31
J
u
nio C Hamano
documentation:
cvs migration - ty
p
ofi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-30
Junio C Hamano
Merge fixes up t
o
GIT 1
.
1
.
6
commit
|
commitdiff
|
tree
2006-01-30
Junio C Hamano
GIT
1
.
1
.
6
commit
|
commitdiff
|
tree
2006-01-29
Junio C Hamano
[
P
ATC
H
] pre-commit samp
l
e hook
:
do not ba
r
f on th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Juni
o
C Hamano
Documentation
:
diff -c
/
--cc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hamano
dif
f
-files -c/--cc: combine only when both ours and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hama
n
o
M
erge
l
t/revlist,jc/diff,jc/
r
evparse,jc/abbrev
commit
|
commitdiff
|
tree
2006-01-28
Ju
n
io C Hamano
rev-par
s
e: make "whatchanged
-- git
-
fetch-scri
p
t" work
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Jun
i
o C Hamano
diff --abbrev=<n> option
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Juni
o
C H
a
mano
pretty_p
r
int_com
m
it:
h
onor
grafts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Ha
m
a
no
p
r
etty_pri
n
t_commit(): pass
c
omm
i
t object instead o
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hamano
Rename rev-parse -
-
abbrev to --short
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
J
u
nio C Hamano
rev-pars
e
--abbr
e
v: do not try abbrev shorte
r
than
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C Hama
n
o
di
f
f-tree: a
b
br
e
viate m
e
rge parent o
b
ject names with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
J
unio
C Hama
n
o
rev-parse: --abbrev optio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hamano
ab
b
rev cleanup:
u
se sym
b
o
l
ic
c
onst
a
n
ts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Juni
o
C Hamano
rev-l
i
st --re
m
ove-em
p
ty: add minimum help an
d
doc
e
ntry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
J
unio C Ha
m
a
n
o
diff
-
fi
l
es:
-
c and --cc op
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio C H
a
mano
comb
i
ne-diff: b
e
t
ter h
u
nk splitti
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Jun
i
o C Hamano
diff-tree --cc: squ
e
lch hea
d
er generation on empty
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Juni
o
C Ha
m
a
no
co
m
bine-d
i
f
f
: extend
--cc logic to Octopus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C
Hamano
combine-diff: minor ou
t
put
c
h
anges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C
H
amano
c
ombine-diff: fix appending at the tail of a list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Jun
i
o C Ham
a
no
diff-tr
e
e --cc: denser combined diff output f
o
r a merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
J
u
nio C Hama
n
o
diff
-
tree -c: sh
o
w
a merge commit
a bit more se
n
sibly
.
Author:
Junio C Hamano
<junkio@cox.net>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hamano
merge:
s
eed
th
e
commit messa
g
e
wit
h
list
of conflicted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-27
Junio C Hamano
Merge
f
ixe
s
up to GI
T
1
.
1
.
5
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-27
Junio C Hamano
GIT 1
.
1
.
5
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-27
Junio C Hama
n
o
GIT 1
.
0
.
13
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-27
Jun
i
o C Hamano
checkout:
do
n
ot ma
k
e a t
e
m
porary co
p
y of s
y
mlink target
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-27
Junio C Hamano
git-fe
t
ch
--uplo
a
d-pack: disambiguate
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-25
J
unio C Hamano
tes
t
s: adju
s
t breakage by
st
r
icter rev-
p
arse
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-25
Juni
o
C
Hamano
Merg
e
branches
'
jc/clone',
'md/env' and 'mo/pat
h
'
commit
|
commitdiff
|
tree
2006-01-25
Junio C Hamano
c
lone: do not acc
e
pt
m
ore than one
-
o opt
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-25
Junio C H
a
mano
c
lone: do n
o
t create remotes/origin n
o
r origin bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-25
Junio C Hamano
git-clone:
P
G
1
3 --
n
aked option
to --bare
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-25
Ju
n
io C Hamano
sample upd
a
t
e
-hook: s
a
n
e
ly handle a
new br
a
nch head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-01-23
J
u
nio C Hamano
Docu
m
entation:
f
i
nishing touches
t
o th
e
new tuto
r
ial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next