repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/web' (early part)
2006-12-18
Juni
o
C Hamano
Merge branch 'jn/web'
(
e
a
r
ly par
t
)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
avoid
accessin
g
_
all_ loose refs in git-show-r
e
f
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
git-fetch
:
Avoid re
a
ding pac
k
ed
refs over
and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Hamano
m
a
r
ku
p
fix
i
n s
v
n
import doc
u
menta
t
io
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Fi
x
mis-mark
-
up in git-merge
-
file
.
t
x
t documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C Hamano
Fix check_file_
d
irectory_co
n
flict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C
Hama
n
o
g
it-add: remove conflicting entry wh
e
n
a
dding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
un
i
o
C
Hamano
up
d
ate-index: m
a
ke
D
/F confl
i
ct error a bit mo
r
e verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
merge:
give a bit
prettier merge
m
e
ssage
to "merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hama
n
o
Mer
g
e
b
r
anch 'j
s
/
show'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-rese
t
[--mixed]
<tree> [--] <p
a
ths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-res
e
t: make it
wo
r
k from wi
t
h
i
n
a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
g
i
t-fe
t
ch: make it work from within a
s
ubdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C
Hamano
Update git
-
diff doc
u
mentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
Merge branch
'
jc/diff--ca
c
hed'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
H
amano
g
i
t-sv
n
: allow both
di
f
f
.
color and color
.
d
iff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
config
documenta
t
ion: group
color items t
o
gether
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
a
mano
Merge branch
'jc/read-tree-ig
n
ore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Ha
m
a
n
o
Merge branch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C
Hamano
M
e
rg
e
b
ranch 'np/add
c
ommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
Merge br
a
nch 'lh
/
branch-rena
m
e'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Merge branch 'j
c
/
commit-careful'
commit
|
commitdiff
|
tree
2006-12-13
J
uni
o
C Hamano
Me
r
g
e
branch 'ap/
c
l
one-origi
n
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
ni
o
C
H
amano
Merge branch 'jc/nums
t
at'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge branch 'rr/cvsexportco
m
mit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
an
o
M
erg
e
branch 'ap/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
an
o
branch
-
-color: c
h
a
nge defau
l
t color sele
c
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
m
a
no
Merge branch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
i
o C Hamano
send-pack: ti
g
hten ch
e
cks for remote n
a
mes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Haman
o
git-push: accept tag <ta
g
> as advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
spurious
.
sp in manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
git merge: rew
o
rd fail
u
r
e me
s
sage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Revert "git-diff: Introduce
-
-in
d
ex a
n
d
d
e
precate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o
C Hamano
g
it-push:
d
o
cume
n
t
r
e
moval of
r
emote ref with :<
d
st
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
Merg
e
br
a
nch 'master' into js/merge
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C
H
a
mano
M
e
rge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
add tes
t
case
f
or re
c
ur
s
ive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C Ha
m
ano
diff -
-
numstat: show bina
r
y wit
h
'
-
' t
o
match "ap
p
ly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
u
n
io
C Hama
n
o
shortlog: fi
x
segfau
l
t
o
n empt
y
aut
h
o
r
name
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C Hamano
shortlog:
remove "[PATCH]" pre
f
ix from shortlog
o
u
t
p
ut
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jun
i
o C Hamano
Mer
g
e br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hamano
git-commit: allow --only
t
o
lose what was s
t
aged earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio
C
Hama
n
o
Do
c
umentation/git-commit:
rewr
i
te to m
a
ke
it more end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio C Ha
m
a
n
o
git-rerere: add
'
gc'
c
om
m
and
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
u
n
io C H
a
mano
Fix perl/
build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Haman
o
Merge
b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C
Hamano
git-mer
g
e: f
i
x
"
fi
x
confusion between tag
and branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
n
io C Hamano
git-merge: sq
u
e
l
ch needless err
o
r
m
essage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Ha
m
ano
Me
r
ge
commit
|
commitdiff
|
tree
2006-12-06
Junio
C H
a
mano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-reset to remove "$GI
T
_DI
R
/
M
ER
G
E_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
r
ead-
t
ree: docum
e
nt --exclude-p
e
r-directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
a
man
o
Loosen "w
o
rkin
g
file will be lost" c
h
eck in Porcelai
n
-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
amano
read-tree: fur
t
h
er loosen
"wo
r
k
i
ng file will be lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Junio
C
Hamano
M
e
rge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2006-12-04
Junio C
Hamano
unpack-t
r
ees: m
a
ke sure "d
f
_conflict_entry
.
name" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
receive-pa
c
k: do not insist on fast-
f
orward ou
t
side
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Ju
n
io C Ha
m
ano
merge-recursive: use
xdl_merge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
x
merge
:
make re
t
urn va
l
ue from
xdl_merge()
more
u
sab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
J
u
n
i
o C Hamano
g
it
-
merge
:
f
i
x c
o
nfusion between tag and bran
c
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
un
i
o C Hamano
Merge maste
r
.
kernel
.
org:/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Jun
i
o C Hamano
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Hamano
tutori
a
l
: talk about user
.
name early and d
o
n't st
a
rt
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ha
m
ano
Merge br
a
nch 'jc/globfetch'
commit
|
commitdiff
|
tree
2006-11-29
Junio
C Ha
m
ano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2006-11-29
Jun
i
o C Hamano
g
i
t bl
a
me -C: fix ou
t
put format tweaks
w
h
en crossi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o
C Haman
o
c
vsimport: st
y
le fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Ham
a
no
Merge branch 'js/sh
o
r
t
l
o
g'
commit
|
commitdiff
|
tree
2006-11-27
Junio C H
a
mano
Merge
b
r
anch 'jc/pu
s
h-de
l
e
t
e
-
re
f
'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
M
e
rge branch
'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
git-merge
:
do
not leak rev-parse
ou
t
put
u
sed for check
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
H
ama
n
o
g
it-merge: tighten error
c
h
e
cki
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Ham
a
n
o
Merge branch 'j
c
/pack-peele
d
'
commit
|
commitdiff
|
tree
2006-11-26
Ju
n
io C Hamano
grep: do
n
ot skip unmerge
d
e
n
tries when grepping in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio C
H
amano
M
e
r
ge br
a
nch
'
jn/web'
commit
|
commitdiff
|
tree
2006-11-25
Junio C
H
a
mano
fetch-p
a
ck: do not barf when duplicate re
p
at
t
erns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
unio C
Hamano
gi
t
-fetch:
allow forcing gl
o
b pa
t
tern in refs
p
ec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hama
n
o
M
e
rge branch 'master'
i
nt
o
jc/globfe
t
ch
commit
|
commitdiff
|
tree
2006-11-25
Junio C H
a
mano
git-
f
etch: exit wit
h
non-zero sta
t
us when
f
as
t
-
for
w
ard
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
Hamano
git-commit: sh
o
w --
s
ummar
y
a
f
ter successful commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
g
i
t-shortlo
g
: ma
k
e common repos
i
tory pref
i
x
c
o
n
figurab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
gi
t
-shortlog
:
fix common repository prefix abbreviation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Hamano
git-bran
c
h -D: make
it wor
k
even when on a yet-to-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ha
m
ano
g
i
t-clon
e
:
stop d
u
mb
p
r
oto
c
ol from copyin
g
refs outsi
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gi
t
web: (style)
use
ch
o
m
p
wit
h
out parentheses con
s
istently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Haman
o
Allow git push to de
l
ete re
m
o
te
r
ef
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C H
a
mano
Merge branch 'jn/web'
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Hamano
Merge branch
'pb/
d
iffroot'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
Ham
a
n
o
Merge branch 'jc/pack-heuristics'
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o
C Hamano
Merge bran
c
h 'j
c
/numstat'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Hamano
Merge bra
n
ch 'ap
/
branch-r
e
f-
d
is
p
lay'
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
io C Hama
n
o
Merge bra
n
ch 'ap/
p
rune'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Hamano
Ty
p
e
f
ix b
u
iltin-prune
.
c::
p
ru
n
e_object()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C Hamano
Me
r
ge branch
'
jc/uplo
a
d-pack'
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C Hamano
refs outsid
e
refs/{heads,tags} match
less strongly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io
C Hamano
git-fetch: allow glob
patte
r
n in ref
s
pe
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Hama
n
o
git-fe
t
c
h
:
fix d
u
m
b
proto
c
ol transport to
f
etch from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next