repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-diff: do not fall back on --cc when -[123], --ours etc. are given.
2006-02-06
Juni
o
C Hamano
git-diff: do no
t
fall back
o
n --cc when -[123]
,
--ours
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
J
uni
o
C Ha
m
a
n
o
Merge bran
c
h 'jc/diff'
commit
|
commitdiff
|
tree
2006-02-06
Junio
C
Hamano
M
e
rge br
a
nches 'lt
/
show
'
a
nd 'lt/re
v
l
is
t
'
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hamano
Merge
branches 'jc/daemo
n
'
an
d
'mw/http'
commit
|
commitdiff
|
tree
2006-02-06
Junio
C
H
ama
n
o
gi
t
-
d
iff-tree --stdin: show
a
l
l p
a
rents
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C H
a
mano
com
b
ine-
d
i
ff: remove
misguided
--
s
how-em
p
t
y
hack
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Jun
i
o C Ham
a
no
d
a
emon
:
e
xtend user-re
l
ativ
e
path nota
t
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Ham
a
no
daemon:
d
o not for
b
id use
r
rel
a
tive paths unc
o
nditionally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Haman
o
git-show
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Haman
o
git-diff: use --cc i
n
stead
o
f
-p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Ham
a
no
diff-inde
x
: make --cc 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 not fall back o
n
vi on dumb terminals
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-04
J
unio C Hamano
Merg
e
branches 'jc/
s
ha1', 'jc/di
f
f' and 'jc/
w
s
'
commit
|
commitdiff
|
tree
2006-02-04
Junio C Hamano
git-merge: Prop
e
r
l
y
quote $merge_msg variab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
J
u
nio C Hamano
get_sha1_
1
: allow octopus^12 to
be properly parse
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Jun
i
o C Ham
a
no
w
h
itespace
c
leanup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Juni
o
C Hama
n
o
co
m
bine-dif
f
: finish
i
ng
t
o
u
c
h
es to git-diff-tree
-
-
c
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Junio C H
a
mano
c
o
mbine-di
f
f
:
cleanu
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Junio C Haman
o
combine-diff: sh
o
w par
e
nt line number
s
as wel
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Ju
n
io C Hamano
combine-dif
f
: add a bit m
o
re comm
e
nts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Junio C
H
a
mano
com
m
it
.
c:
"Mer
g
e" fix
i
n
p
retty_print_c
o
mmit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
J
u
nio C Hamano
Documentat
i
on:
git
-
diff-
t
ree --cc also omits e
m
pty
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Junio C Hamano
combin
e
-diff: fi
x
pl
a
cement of deletion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Junio C Hamano
combine
-
dif
f
: a
d
d safe
t
y check to --cc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
J
u
ni
o
C Ha
m
ano
combine-di
f
f: update --cc "un
i
nteresting hunks" logic
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
J
unio C Hamano
combin
e
-diff: reuse diff
from
t
h
e sam
e
blob
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Junio C Hamano
rev-list: omit
d
upl
i
cated parents
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
J
u
n
i
o C Haman
o
u
p
date-index --i
n
dex-in
f
o: allow stage 0
entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-31
Jun
i
o C Ha
m
ano
Merge branches
'bf/doc' a
n
d 'db/tartree
'
commit
|
commitdiff
|
tree
2006-01-31
J
u
n
io C Hamano
do
c
ument
a
tio
n
: cvs migra
t
i
o
n - typofix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-30
Junio
C Hamano
M
erge fixe
s
up t
o
G
I
T 1
.
1
.
6
commit
|
commitdiff
|
tree
2006-01-30
Ju
n
io C H
a
mano
GIT 1
.
1
.
6
commit
|
commitdiff
|
tree
2006-01-29
Junio C Hamano
[PATCH]
pre-commit sa
m
ple ho
o
k: do not barf on th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Jun
i
o C Ha
m
an
o
Doc
u
m
e
ntation: di
f
f -c/--cc
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C
H
amano
d
i
f
f-files
-
c/--cc: combin
e
onl
y
when both ours and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C H
a
mano
Merge lt/revlist,jc/di
f
f,jc/re
v
parse,jc
/
abbrev
commit
|
commitdiff
|
tree
2006-01-28
Ju
n
io C Hamano
rev-parse: make
"whatcha
n
ged -- g
i
t-fetch-scri
p
t" w
o
rk
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C
Hamano
diff --abbrev=<n> o
p
tion fi
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Jun
i
o
C
Hamano
prett
y
_p
r
int_
c
ommit
:
honor grafts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Ju
n
io C
H
a
mano
pretty_pri
n
t_commi
t
(): pass
commit object inst
e
ad of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
J
u
n
io
C
Hamano
Rename rev
-
parse --abbrev to
--shor
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C
H
amano
rev-parse -
-
abbrev: do not
try abbre
v
s
h
o
rter than
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C H
a
man
o
dif
f
-tree: abbreviat
e
merge parent object
n
a
m
es with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C H
a
mano
rev-pa
r
se: --abbrev
o
p
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hamano
abbrev cleanup: use s
y
mbolic
c
onst
a
nts
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
J
u
nio C Hamano
rev-list --remo
v
e-emp
t
y: add minimum h
e
l
p
and do
c
entry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C H
a
m
ano
diff-files: -c
and --
c
c o
p
tion
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
J
u
nio C Hamano
com
b
ine-diff: better
h
unk spl
i
ttin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Haman
o
diff-tr
e
e --cc: squ
e
l
c
h
h
ea
d
er
g
enerat
i
on o
n
empty
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hamano
combine-di
f
f: exte
n
d --cc l
o
gic
t
o Octo
p
u
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hamano
c
ombine-diff
:
mino
r
o
u
t
put changes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Ju
n
i
o C Hamano
combine-diff: fix
a
p
pendi
n
g at the
tail of
a li
s
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Juni
o
C Hamano
diff-tree --cc
:
denser combined di
f
f output for a merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C
Hamano
diff-tree -c:
s
how a me
r
g
e
commit a bit more
sensibly
.
Author: Junio C Hamano <
junkio@cox.net
>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C
H
am
a
no
merge: seed the commit message with list of conflicted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-27
Junio C
Hamano
Merge fixes up to GIT 1
.
1
.
5
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-27
Junio
C
Hamano
G
IT 1
.
1
.
5
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-27
Junio C
H
amano
GIT 1
.
0
.
13
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-27
Junio C Hamano
checko
u
t: do
not make a temporary copy of sy
m
link target
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-27
Ju
n
io C
H
amano
git-fetch --uploa
d
-pack: di
s
ambigu
a
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
Junio C Hamano
t
ests: adjust breakage by stricter rev
-
par
s
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
Junio C Hamano
Mer
g
e
b
ranches
'jc/clone', 'md/env
'
a
nd
'
mo/
p
at
h
'
commit
|
commitdiff
|
tree
2006-01-25
J
u
nio C Hama
n
o
clon
e
: do
n
ot accept
m
o
re t
h
a
n
one -o o
p
ti
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
Junio C
H
a
mano
clone
:
do not crea
t
e remotes/
o
rigin no
r
origi
n
branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
Junio C Hamano
g
i
t
-c
l
on
e
: PG13 --naked op
t
i
o
n to
-
-bare
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
J
unio C
H
amano
sa
m
ple update
-
hook: sanely handle
a new branch head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-23
J
unio C Hamano
Docume
n
tation: fi
n
i
s
hing touche
s
t
o
t
he
n
ew tuto
r
ial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-23
Junio C Ha
m
ano
Reco
m
mend
t
o remove u
n
used
`origi
n
` in
a shared r
e
posi
t
or
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Junio C
Hamano
git-
g
rep:
clarific
a
tion on pa
r
ame
t
ers
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Jun
i
o C
H
amano
U
nde
f
DT_* bef
o
re redef
i
ning th
e
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Junio C Hamano
t4011:
"
slee
p
1
"
i
s
not enough on FAT
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Junio
C
Hamano
DT_UNKNOWN:
d
o
n
o
t fully t
r
ust existen
c
e of DT_UNKNOWN
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Junio C Hama
n
o
f
s
ck-objects: support platforms without d_ino i
n
st
r
uct
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Junio C
Hamano
M
akefil
e
: do not assume lack of
I
PV6
means no sockaddr_storag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-21
J
u
nio C Hamano
Revert
"
g
it-pus
h
:
av
o
id fall
i
ng b
a
ck on pushing "
m
atchi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-20
Junio C Haman
o
Merge fixes
up to GIT 1
.
1
.
4
commit
|
commitdiff
|
tree
2006-01-20
Junio C Ham
a
no
G
I
T
1
.
1
.
4
commit
|
commitdiff
|
tree
2006-01-20
J
u
ni
o
C Hamano
GIT 1
.
0
.
12
commit
|
commitdiff
|
tree
2006-01-20
Junio C Hamano
Reve
r
t
"
check_packed_git_idx
(
): c
h
ec
k
int
e
grity of
.
.
.
commit
|
commitdiff
|
tree
2006-01-16
Junio C Hamano
Allow b
u
ilding of RPM from i
n
t
e
ri
m
snap
s
hot
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-16
Junio C Haman
o
git-push: fix --tags
a
nd document it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-16
Junio C Hamano
Mer
g
e
f
ix
e
s up to
GI
T
1
.
1
.
3
commit
|
commitdiff
|
tree
2006-01-16
Junio C Hamano
G
I
T 1
.
1
.
3
commit
|
commitdiff
|
tree
2006-01-16
Ju
n
io C Haman
o
describe: omit c
l
earing marks on t
h
e last one
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-16
Juni
o
C Hamano
Merge bra
n
ch 'fix'
commit
|
commitdiff
|
tree
2006-01-16
J
unio C Hamano
cvsim
p
or
t
: ease migration f
r
om CVSR
O
OT/users f
o
rmat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-16
Junio C Hamano
Merge branch
'fix
o
/1
.
0'
commit
|
commitdiff
|
tree
2006-01-16
J
u
nio C Hamano
GIT
1
.
0
.
11
commit
|
commitdiff
|
tree
2006-01-16
Junio C Ham
a
no
dif
f
cor
e
-break/diffcore-rename:
int
e
g
e
r
o
v
erflow
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-15
Junio C
Ham
a
no
M
erge branch
e
s
'
jc/checkout'
,
'jc/form
a
t-patc
h
', 'j
c
.
.
.
commit
|
commitdiff
|
tree
2006-01-15
Junio
C
Hamano
s
h
o
w
-branch
:
--current includes the current branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-15
J
u
ni
o
C Haman
o
s
h
o
w
-branch: ma
k
e the c
u
r
r
ent
branch and merge co
m
mit
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-15
J
u
nio C H
a
mano
Documentati
o
n: show-
b
ranch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-15
Junio C Hamano
octo
p
us:
allow manual
r
esolv
e
on
the
l
a
s
t round
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-15
Junio C Hamano
[
PATCH] f
o
rmat-patch: always
-
-
mbox a
n
d show s
a
n
e Date:
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-15
Junio
C
Hamano
clone
:
--
n
aked
option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-14
Junio C Hamano
[P
A
T
C
H]
c
heckout:
s
how dirty s
t
ate
upon switching branches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-14
Junio C Hamano
gi
t
-push: avoid falling bac
k
on pushing "m
a
tching"
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-14
Junio C Ha
m
ano
che
c
kout: merge lo
c
al modifica
t
ion
s
wh
i
l
e
s
w
i
tching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-14
Junio C Haman
o
ch
e
c
k
out: aut
o
merge
local
change
s
while switching branches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next