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
xmerge: make return value from xdl_merge() more usable.
2006-12-03
Junio C Hamano
xme
r
ge:
m
ake return value from xd
l
_merge() more usa
b
le
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ha
m
a
n
o
Me
r
ge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ha
m
a
no
git-merge: fix confusion
b
etween
t
a
g and branc
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Me
r
ge master
.
k
e
rnel
.
or
g
:/pu
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Hama
n
o
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hama
n
o
tuto
r
ial: talk about user
.
n
a
me early an
d
don
'
t start
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
J
u
n
i
o
C
Hamano
M
erge branch 'jc
/
globfe
t
ch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
git blame -C:
f
ix outpu
t
format tweaks whe
n
cros
s
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C
H
amano
cvsimport: style fixup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branc
h
'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C
H
a
m
ano
Merge branch 'jc/push-d
e
lete-ref'
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C H
a
man
o
Merge
b
ra
n
ch
'
jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
am
a
no
g
it
-
merge: do
n
o
t
leak rev-parse
ou
t
p
ut used for
c
hecking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
git-merge: tighten error
c
h
e
ck
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
M
e
rge br
a
nch 'jc/pack
-
pe
e
led'
commit
|
commitdiff
|
tree
2006-11-26
Juni
o
C Haman
o
g
rep:
do not skip unmerged entries
when grepping in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
Merge bran
c
h 'jn/web'
commit
|
commitdiff
|
tree
2006-11-25
Junio C
Hamano
f
etc
h
-pack: d
o
not
b
ar
f
whe
n
duplica
t
e re patt
e
rn
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ha
m
a
no
g
i
t
-
fetch: allow forc
i
ng glob pat
t
ern in re
f
s
pec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
Hamano
Merge br
a
nch 'master'
into jc/g
l
obfetch
commit
|
commitdiff
|
tree
2006-11-25
J
unio C
H
amano
git-fetch: exit
with non-zero
s
t
a
t
us when
fast-for
w
ard
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
unio C Hama
n
o
git-
s
hortlog: make common repository
p
r
e
fix configurable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Ha
m
ano
git-s
h
o
rt
l
og: fix com
m
on
r
eposi
t
or
y
pr
e
fix abbrevi
a
tio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Hamano
g
i
t-branch -D:
make it work even when
o
n a yet-to-be
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C Ha
m
ano
g
i
t-clone: stop du
m
b prot
o
col from copying r
e
fs
outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ha
m
ano
gitweb:
(
style) use chomp wi
t
ho
u
t
p
arentheses consistently
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
H
a
mano
Allow gi
t
pu
s
h to delete remote ref
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
io
C Haman
o
Merg
e
branch
'
j
n
/web'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Me
r
ge branch
'
pb/dif
f
roo
t
'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
Ha
m
ano
Merge branch 'jc/pack-heu
r
istics'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C H
a
mano
Merge bra
n
ch
'
jc/
n
u
m
stat'
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio
C Hamano
M
e
rge
b
ranc
h
'ap/branch-ref-d
i
spla
y
'
commit
|
commitdiff
|
tree
2006-11-24
J
unio C Hamano
Merge branch
'
ap
/
p
run
e
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
H
amano
Typefix builtin-p
r
une
.
c
:
:
prune_obj
e
ct()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branch 'jc/upload-pack'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
H
a
m
an
o
r
e
f
s ou
t
side refs/{heads,tags} match less st
r
ongly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ham
a
n
o
git-fetch:
a
llo
w
glob pattern in refspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C Hamano
git-fetch: fix dumb protoc
o
l tra
n
sport t
o
f
etch from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C
H
aman
o
git
-
f
etch: reu
s
e ls-rem
o
te resul
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
Junio C Hamano
GIT 1
.
4
.
4
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
Juni
o
C
H
amano
trust-exec
u
table-bit: fix breakage for symlinks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
J
u
n
io C
Hamano
St
o
re peeled ref
s
i
n packe
d
-ref
s
(take 2)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Hamano
m
e
r
g
e: al
l
ow mergi
n
g into
a
ye
t
-to-be-born branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
J
unio C Hamano
git-merge: make
it usab
l
e as th
e
first
class UI
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
Junio C
Hamano
remo
v
e
m
erge-
r
ecursiv
e
-old
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
Junio C Hamano
Store peeled
r
efs in packed-refs file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
Junio C Hamano
do_for_
e
ach_re
f
: perform
t
he same sanity check
fo
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
Junio C Hamano
git-fetch: follow lightwe
i
t tags as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-17
Junio C Hamano
pack-ob
j
ects:
tweak "
d
o not even attemp
t
delta"
heu
r
istics
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Junio C
H
a
mano
convert-objects
:
s
e
t _
X
O
PEN
_
SOURC
E
t
o
6
00
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
J
un
i
o C Hamano
git-c
h
eckout: allo
w
p
a
thsp
e
c t
o
recover
los
t
working
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Junio C
Hama
n
o
git-
c
heckout: do not
a
l
l
ow
-f and
-m at the
s
am
e
time
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
J
u
nio C
Hamano
apply --
n
umstat: ma
r
k binary
d
i
f
fstat with -
-, not 0 0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Junio C Hamano
GIT 1
.
4
.
4
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-13
Junio
C Ham
a
n
o
M
e
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-11-12
Ju
n
io C Ham
a
no
GI
T
1
.
4
.
4-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-12
J
unio C Hama
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-11-12
Jun
i
o C
Hamano
gi
t
-cvsserver:
rea
d
f
r
om git
w
ith -z to get non-ASCII
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-11
Junio C H
a
mano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-11-11
J
u
nio C Ham
a
no
path-lis
t
: fix path-list-insert
ret
u
rn va
l
ue
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-10
Ju
n
io C Hamano
git
-
annotate:
fix -S on
g
raft
f
ile with comments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-10
Ju
n
io C Hamano
git
-
annot
a
te
:
no n
e
ed to ex
e
c bl
a
me; it is built-in
.
.
.
commit
|
commitdiff
|
tree
2006-11-09
Junio C Ha
m
a
no
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2006-11-09
Junio C H
a
mano
Docume
n
tation: move blame examples
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
g
i
tweb: fix
u
nmatch
e
d div in com
m
itdiff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
gitweb: prote
c
t commit messa
g
es from
c
ontrols
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
gitweb: protect blob and d
i
ff output lin
e
s from contr
o
ls
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio C
Hamano
git-pickaxe: retire pickaxe
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio
C
Hama
n
o
Merge
g
i
t://git
.
k
e
rnel
.
org
/
pub/scm
/
gitk/g
i
tk
commit
|
commitdiff
|
tree
2006-11-08
J
u
nio
C
H
a
m
a
n
o
git-statu
s
: q
u
ote LF in its output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio
C Hamano
gitweb:
d
o not give
b
lame
l
i
nk uncondition
a
lly in
d
iff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Jun
i
o
C Hamano
gitweb: minimally fix "for
k
" support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Ju
n
io C Haman
o
gitweb: fix
d
isabling o
f
"forks"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
GIT 1
.
4
.
3-r
c
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio C
H
a
mano
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2006-11-08
Junio C
Hamano
Me
r
ge bran
c
h
'jc/pi
c
kax
e
'
commit
|
commitdiff
|
tree
2006-11-08
Junio
C Hamano
git-pickaxe: allow "-L
<something>,+N"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-07
Junio C Hamano
M
erge branch '
j
c/read-tre
e
'
commit
|
commitdiff
|
tree
2006-11-07
Juni
o
C Ham
a
no
M
erg
e
bra
n
ch 'np/index-
p
ack'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Hamano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Hamano
git-pickaxe:
-
L /regexp/,/
r
egexp
/
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-06
Junio C Hamano
Document git-pack-refs
and l
i
n
k
it to g
i
t(7)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-06
Juni
o
C Hama
n
o
adjust_shared_perm: chmod() only when needed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hamano
git-pi
c
kaxe: optim
i
z
e
by avoi
d
ing repe
a
ted re
a
d
_sha1_file()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Junio C H
a
mano
git-b
l
ame: add internal statistic
s
t
o
count read b
l
obs
.
commit
|
commitdiff
|
tree
2006-11-05
J
u
nio C
Hamano
cherry is built
-
in, do not ship git-cherry
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Ham
a
no
M
erg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-05
Juni
o
C Hamano
git-pickaxe: fix or
i
g
i
n refcountin
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Ha
m
ano
Merge
branch 'np/verbose
-
pus
h
'
commit
|
commitdiff
|
tree
2006-11-05
Junio C
H
amano
Merge
b
ran
c
h 'lt
/
push-config'
commit
|
commitdiff
|
tree
2006-11-05
J
unio C Ham
a
n
o
Merge branch 'pb/web'
commit
|
commitdiff
|
tree
2006-11-05
Junio C Ha
m
an
o
g
i
t-pi
c
kaxe:
r
e-scan the blob
after making prog
r
ess
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-04
Junio C Hamano
g
it-pickaxe: re-scan the
b
lob after making progress
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-04
Jun
i
o C Hamano
git-pickaxe: s
i
mplify Octopus m
e
rges further
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-04
Ju
n
io C Hamano
git-pickaxe:
rename
detectio
n
optimization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-04
Junio C Haman
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-11-04
Junio C Hamano
apply: ha
n
dle "t
r
aditi
o
nal" creation/de
l
etion diff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-03
Ju
n
io C
Hamano
M
e
rg
e
branch 'm
a
ster' in
t
o n
p
/index-pac
k
commit
|
commitdiff
|
tree
next