repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07
Junio C H
a
man
o
Merge
git:
/
/git
.
kernel
.
org/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2006-02-07
Junio C Hamano
git
-
commit: fin
i
shing
t
ouche
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-07
Junio C Hamano
git-co
m
m
it
:
r
e
vamp the git-commit se
m
a
ntic
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-07
Junio C
H
amano
git-rerere: reuse recorded resolve
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-07
Junio C H
a
m
ano
fmt-
m
erg
e
-msg: show
s
ummary
of what
is merged
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-07
Junio C Ha
m
ano
rea
d
-tree --a
g
gre
s
sive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-07
J
u
n
io C Hamano
[PATCH] m
a
il
i
nfo: reset CTE a
f
t
e
r
e
a
c
h multip
a
r
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-07
Junio C Hamano
comb
i
ne-diff:
do n
o
t punt on removed or ad
d
e
d
f
iles
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Ham
a
no
c
o
mbi
n
e-diff: s
h
ow mo
d
e changes as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hama
n
o
combine
-
d
i
ff:
d
o
n
o
t
send NULL to p
r
int
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Haman
o
core-tutorial: adjust t
o
r
e
cent r
e
ality
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hamano
g
i
t-
d
i
f
f: do not fall back on -
-
c
c
when -[123], --ours
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Ju
n
io C H
a
ma
n
o
Merge
b
ranch 'jc/diff'
commit
|
commitdiff
|
tree
2006-02-06
J
u
n
i
o
C Hamano
Merge
b
ran
c
h
e
s 'lt/show'
a
nd
'lt/r
e
vlis
t
'
commit
|
commitdiff
|
tree
2006-02-06
Junio
C Haman
o
M
erg
e
bran
c
h
e
s
'j
c
/da
e
mon' and 'mw/http'
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hamano
git
-
d
iff-tree --stdin: sh
o
w
al
l
parents
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Juni
o
C
Hamano
combine-diff: remove mi
s
g
u
ide
d
--sh
o
w-empty h
a
ck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Juni
o
C Hamano
daemon: extend
u
ser-rel
a
tive p
a
th notation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hamano
da
e
mon: do not
forbid u
s
e
r re
l
ative pa
t
hs unconditionally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C
H
amano
gi
t
-
s
how
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C H
a
man
o
git
-
di
f
f: use -
-
cc instead o
f
-p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-06
Junio C Hamano
diff-
i
n
dex: make --cc
a
sy
n
o
n
ym for -p
for now
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-05
J
unio C Hamano
Do not fall back on
vi on dumb terminals
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-04
Junio C Hamano
M
e
rge branc
h
es 'jc/sha1'
,
'jc
/
diff'
a
n
d
'jc/ws'
commit
|
commitdiff
|
tree
2006-02-04
Junio C H
a
man
o
git-merge: Properly quo
t
e $merge
_
m
s
g var
i
able
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Junio C Hama
n
o
g
et
_
sha1_1: allow octopus^12 to
b
e properly p
a
rsed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Junio C H
a
mano
white
s
pa
c
e clea
n
up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
J
unio C Hamano
c
o
mbine
-
d
i
ff:
f
i
nishing touches to git-diff
-
tr
e
e -
-
cc
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Junio
C Hamano
combine-di
f
f: cleanup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Junio C
H
amano
com
b
i
n
e-diff:
show parent l
i
ne
numbers
a
s w
e
ll
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Junio C Hamano
combine-diff:
ad
d
a bit more comments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-03
Junio C Hamano
c
ommit
.
c
:
"Merge" fix in pretty_print_commi
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Junio C H
a
man
o
Documentation: git-diff
-
tree
-
-cc also omits empty
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Junio
C
Hamano
combin
e
-diff: f
i
x
place
m
ent of deletion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Juni
o
C H
a
mano
combine-diff
:
add safety check
to --cc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Jun
i
o C Hamano
combine-diff: update
--cc
"
uni
n
ter
e
sting hunks
"
logic
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Junio
C Hama
n
o
c
ombi
n
e-
d
iff: reuse d
i
ff
from th
e
same b
l
ob
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Junio C Hamano
rev-list: omit dupli
c
a
t
ed parents
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-02-02
Junio C
Ha
m
a
n
o
upda
t
e-i
n
d
ex
--index-info: al
l
ow
stage 0 entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-31
Juni
o
C Hama
n
o
Mer
g
e bran
c
h
es
'
bf/doc' and 'db/tart
r
ee'
commit
|
commitdiff
|
tree
2006-01-31
Jun
i
o C Hamano
documentatio
n
: cvs migration - typofix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-30
Jun
i
o C Hamano
Merge fixes up
t
o GIT 1
.
1
.
6
commit
|
commitdiff
|
tree
2006-01-30
Junio
C
H
amano
G
I
T 1
.
1
.
6
commit
|
commitdiff
|
tree
2006-01-29
J
unio C Hama
n
o
[PATC
H
] pre-c
o
mmi
t
sample hook: do not b
a
rf
o
n t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Jun
i
o
C Hamano
Documentat
i
o
n: diff -c
/
--cc
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C
Hamano
diff-files -c/--cc:
c
ombine only when both ours an
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
J
unio C Hamano
Merge lt/revl
i
st,j
c
/
d
iff,j
c
/revparse,
j
c/abbre
v
commit
|
commitdiff
|
tree
2006-01-28
J
unio C Hama
n
o
re
v
-parse: make "whatchanged -
-
git-
f
etch-script" wo
r
k
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C
Hamano
d
iff -
-
abbrev=<n> option f
i
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
J
u
nio C Hamano
pretty_pri
n
t_com
m
it: honor grafts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
J
unio C Hama
n
o
pretty_print_comm
i
t(
)
: pass commit object ins
t
ead of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
J
unio C H
a
mano
Rename rev-pars
e
--abbre
v
to
--sh
o
rt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C
Ham
a
no
r
e
v-pars
e
--
a
bbrev: do
not try abbrev shor
t
er
t
han
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Ham
a
no
dif
f
-
t
ree:
abb
r
e
v
iate
m
erg
e
parent
obj
e
ct nam
e
s with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Jun
i
o C Ham
a
no
rev-pa
r
s
e
: --a
b
brev o
p
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio
C
Hamano
abbrev cle
a
n
u
p
: use symbolic constants
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hamano
rev-
l
ist --remov
e
-empty: add minimum he
l
p and doc entr
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C Hamano
diff-f
i
les: -c and --cc opti
o
ns
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Junio C
H
amano
combine-di
f
f: bett
e
r hunk s
p
litting
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Juni
o
C H
a
mano
di
f
f-tree
-
-cc: squelc
h
hea
d
er generat
i
on o
n
empty
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
J
unio C
H
am
a
no
combine
-
diff: ex
t
end --cc logic
t
o Octop
u
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Ju
n
i
o
C Hamano
c
o
m
b
ine-di
f
f
: minor
o
utput changes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
Ju
n
io
C Hamano
combine-diff: fix appe
n
ding
a
t
t
he tail of a lis
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-28
J
u
n
io
C
Hama
n
o
diff-tree
-
-cc: denser
c
o
m
bine
d
diff
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
h
ow
a
merg
e
commit a bit more sen
s
i
b
ly
.
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: 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
GIT
1
.
1
.
5
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-27
Junio C
Hamano
GIT 1
.
0
.
13
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-27
Junio C Hamano
checkout: do not
m
ake a tem
p
orary
cop
y
of symlink target
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-27
Junio C H
a
mano
gi
t
-fetch
-
-uplo
a
d
-
pack: disamb
i
g
uate
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
J
unio C H
a
mano
t
ests:
a
djust br
e
ak
a
ge
b
y
stricter rev
-
parse
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
Junio C
H
amano
Merge bra
n
ches 'jc/c
l
on
e
'
,
'md/env' and 'mo/path'
commit
|
commitdiff
|
tree
2006-01-25
J
u
n
io C Hamano
clone: do not ac
c
ept more than one -o option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
Junio C Hamano
cl
o
ne:
d
o not
cre
a
te re
m
otes/or
i
gin
n
or origin branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
Junio C Ham
a
no
git-c
l
one: PG13 --naked option to
--bare
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-25
Junio C Haman
o
sample updat
e
-hook: sanely handle a new
bra
n
ch head
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-23
Junio C Hamano
Do
c
umen
t
at
i
on: finishing touch
e
s to
the new tu
t
ori
a
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-23
Juni
o
C
Hamano
Recomme
n
d t
o
remove unused `origin` in
a shared
r
e
pository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Junio C Haman
o
git-gre
p
: clarificat
i
on
o
n pa
r
ame
t
ers
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Ju
n
i
o
C Haman
o
Undef DT_* be
f
ore redefining th
e
m
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Junio C Hama
n
o
t4011
:
"sleep 1" is not enou
g
h
on
F
AT
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Junio C
Hamano
DT
_
UNKNOWN: do n
o
t fully trust
e
xistence of
DT_UNKNOWN
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Juni
o
C Ham
a
n
o
fsck-o
b
je
c
ts:
s
uppo
r
t
pla
t
forms without d
_
ino in struct
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-22
Junio C Hamano
Makefile: do not assu
m
e l
a
ck o
f
IPV
6
means no sockaddr_storage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-21
J
unio C Haman
o
Rev
e
rt "git-push
:
avoid fa
l
ling back on p
u
shing
"
matc
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-20
Junio C Hamano
Merge fixe
s
up
to
G
IT 1
.
1
.
4
commit
|
commitdiff
|
tree
2006-01-20
Junio C
Hamano
GIT 1
.
1
.
4
commit
|
commitdiff
|
tree
2006-01-20
Junio
C
H
amano
GIT 1
.
0
.
12
commit
|
commitdiff
|
tree
2006-01-20
Juni
o
C Hamano
Reve
r
t "check_pack
e
d_git_id
x
(): check integ
r
it
y
o
f
.
.
.
commit
|
commitdiff
|
tree
2006-01-16
Junio C H
a
m
a
n
o
All
o
w
build
i
ng o
f
RPM fro
m
interim snapshot
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-16
Junio C
Hama
n
o
git-pus
h
:
fix
-
-tag
s
and
do
c
ume
n
t it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-16
Junio C Hamano
M
e
r
g
e fixes
up to GIT 1
.
1
.
3
commit
|
commitdiff
|
tree
2006-01-16
Junio
C Haman
o
G
IT 1
.
1
.
3
commit
|
commitdiff
|
tree
2006-01-16
Junio C
Hamano
d
e
scribe:
o
mit clearing
m
arks on
the
la
s
t one
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-16
Junio C Hamano
M
erge branch 'f
i
x'
commit
|
commitdiff
|
tree
2006-01-16
Junio C Hamano
c
vsimport: ea
s
e migr
a
ti
o
n fr
o
m C
V
S
R
OOT
/
users f
o
rm
a
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-01-16
Junio C Hamano
Me
r
ge br
a
nch 'f
i
xo/1
.
0'
commit
|
commitdiff
|
tree
2006-01-16
Junio
C Hamano
GI
T
1
.
0
.
11
commit
|
commitdiff
|
tree
2006-01-16
Junio C
Hamano
diffcore-break/diffcore-
r
en
a
me: integer overflow
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next