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
git-reset to remove "$GIT_DIR/MERGE_MSG"
2006-12-06
Junio C Hamano
git-reset
t
o remove "$GIT_DIR/MERGE_MSG
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
unpack-trees: make sure "df_con
f
lict_ent
r
y
.
name" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
u
n
i
o
C
Hamano
receive-pack: do not insist on fast-forward outsid
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
t
uto
r
ial: t
a
lk ab
o
ut user
.
name earl
y
and d
o
n
'
t start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hamano
git blame -C: fix o
u
tput form
a
t
t
w
e
aks when crossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
J
u
nio C Hamano
G
IT
1
.
4
.
4
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Junio C Hamano
trust-executable-
b
it
:
f
i
x brea
k
ag
e
for
s
y
mlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-20
Junio C H
a
mano
do_f
o
r_
e
ac
h
_ref: per
f
o
rm the same sanity
c
heck for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-20
Junio C Hamano
git-fetch: follow lightweit
t
ags as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
J
unio
C
Hamano
c
o
nve
r
t-objects: s
e
t
_XOP
E
N
_SOUR
C
E to 600
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Ju
n
i
o
C Ham
a
n
o
git-checkout: al
l
o
w
pathspec to recover
l
ost working
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Junio C
H
amano
git-c
h
e
ckout:
d
o
n
ot
a
llow -f and -m at the same
t
i
me
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
J
unio C Hamano
GIT 1
.
4
.
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-13
J
u
n
i
o C Hamano
M
e
rge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-11-12
Junio
C Hamano
GIT 1
.
4
.
4-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-12
Ju
n
i
o C Hamano
Merge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-12
Ju
n
io C Hamano
git-cvss
e
r
ver: read fro
m
git with -
z
to
g
et non-ASCII
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-11
Jun
i
o
C Hamano
M
e
rge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2006-11-11
J
u
nio C Ham
a
no
p
a
th-lis
t
: fix path-list-insert return
v
al
u
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-10
Junio C H
a
mano
git-an
n
o
t
ate:
fix -S on graf
t
f
ile with comments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-10
Junio C
H
am
a
n
o
g
i
t-annotate: no need
t
o exec b
l
ame;
i
t is
built-
i
n
.
.
.
commit
|
commitdiff
|
tree
2006-11-09
Junio C
H
amano
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
Documentation:
m
ove bl
a
me examples
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
J
u
nio C Haman
o
Merge
branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2006-11-09
Junio C
Hamano
gitw
e
b:
f
ix
unmatched div in
c
omm
i
tdiff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
g
i
tweb: pr
o
te
c
t com
m
it mess
a
ges from controls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
J
uni
o
C
Hama
n
o
gitweb: protect
blob and d
i
ff output li
n
es
from
c
ontro
l
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Ju
n
io C Hamano
git-pick
a
xe: ret
i
r
e pickaxe
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
Merge g
i
t://gi
t
.
kernel
.
or
g
/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
gi
t
-st
a
tus: quote LF in its output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C
H
a
m
ano
g
itwe
b
: d
o
not give blame link un
c
ondition
a
lly
in diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Juni
o
C Ha
m
a
no
gitw
e
b: mi
n
i
mally fix "fork" s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Juni
o
C
H
am
a
no
gitweb: fix disabli
n
g of "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
Ju
n
io C Haman
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-11-08
Jun
i
o
C H
a
mano
Merge br
a
nch 'jc/pick
a
xe'
commit
|
commitdiff
|
tree
2006-11-08
Ju
n
io
C Ha
m
ano
git-picka
x
e: all
o
w "-L <something>,+N"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-07
Junio C
H
amano
Merge bran
c
h 'jc/read-tree
'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Hamano
Merg
e
b
r
a
n
ch 'np/index-p
a
ck'
commit
|
commitdiff
|
tree
2006-11-07
Ju
n
i
o C Ham
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-11-07
J
unio C
H
amano
git-pickaxe
:
-L
/
regexp/,/r
e
gexp/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-06
Junio
C
Hama
n
o
D
ocument
g
i
t
-pack-refs
a
nd link it to git(7)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-06
J
u
nio C Hama
n
o
adjust_
s
h
a
red_perm: chmod() only
whe
n
needed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Juni
o
C Hamano
git-pi
c
kaxe: optimize by av
o
iding rep
e
ated read_sha1_file()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Junio C
H
amano
g
it-blame:
a
d
d
i
n
t
e
r
n
a
l sta
t
i
stics to cou
n
t r
e
ad b
l
o
b
s
.
commit
|
commitdiff
|
tree
2006-11-05
Junio
C
Hama
n
o
cherry is buil
t
-
i
n, do not ship g
i
t-
c
herry
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-05
J
u
nio C Hamano
g
i
t
-picka
x
e:
f
ix origin refcounting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
J
u
n
io C Hamano
Merge bran
c
h
'np/verbose-p
u
sh'
commit
|
commitdiff
|
tree
2006-11-05
J
unio C
H
a
m
ano
Merge br
a
nch 'lt/push
-
c
o
nfig'
commit
|
commitdiff
|
tree
2006-11-05
J
u
nio
C
Hamano
Merge branch
'pb/web'
commit
|
commitdiff
|
tree
2006-11-05
J
u
nio C Hamano
git-pickaxe:
r
e-
s
ca
n
the blob after making progress
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Junio C Haman
o
git-pickaxe:
re-scan th
e
bl
o
b after maki
n
g
progres
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Jun
i
o C Hamano
git-pickaxe: simplify Octopus merges further
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
J
u
n
i
o C Hamano
git-pi
c
kaxe: rename d
e
tect
i
on optimization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Junio C
H
amano
Merge br
a
nch
'
m
aint'
commit
|
commitdiff
|
tree
2006-11-04
Junio C Ha
m
ano
apply: handle "tra
d
itional
"
creation/deletion diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-03
Junio C Ha
m
ano
Merge branch 'master' into
n
p/index-pack
commit
|
commitdiff
|
tree
2006-11-03
J
unio C Hamano
Merge
b
ranch 'sp
/
k
e
ep-pack' in
t
o np/
i
n
d
ex-pack
commit
|
commitdiff
|
tree
2006-11-03
J
unio C H
a
mano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-11-03
Junio C
Hamano
for-each-ref:
"
creato
r
" and
"
creatordate" fields
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-01
Junio C Hamano
Me
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-11-01
Jun
i
o C Ham
a
no
bra
n
ch: wor
k
in subdirectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-01
J
unio C Hamano
Merge branch
'
rs/cherr
y
'
commit
|
commitdiff
|
tree
2006-11-01
Ju
n
io
C Hamano
Merge branch 'jc/refs-
a
nd-
f
etch'
commit
|
commitdiff
|
tree
2006-11-01
Junio
C H
a
mano
Merge bra
n
ch 'lj/refs'
commit
|
commitdiff
|
tree
2006-10-31
Ju
n
io C
H
am
a
no
link_temp_to_file: d
o
n't leave the path truncated on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Juni
o
C Hamano
Introduc
e
a ne
w
r
evisio
n
set operator
<rev>^!
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Junio C
H
amano
git-pickaxe: cach
e
o
n
e already fou
n
d path per com
m
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Jun
i
o C Haman
o
Merge
branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2006-10-31
Junio C Hamano
r
e
vis
i
o
n travers
a
l: --u
n
p
acked does not
limit
c
o
mmit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Jun
i
o C
Hamano
g
i
t-pickaxe: spli
t
fi
n
d
_ori
g
in() into f
i
nd
_
rename(
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Ju
n
io C Hamano
quote
.
c: e
n
sure the same quoting acros
s
platforms
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-31
Junio C Hamano
Revert "send-pac
k
--
k
eep: do not expl
o
de into loose
.
.
.
commit
|
commitdiff
|
tree
2006-10-30
Junio
C
Haman
o
Surr
o
u
nd "#defin
e
DEBUG 0" with "#ifnd
e
f
D
EBU
G
.
.
#endif"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-30
Junio C Hamano
git-pickaxe:
t
i
g
h
ten san
i
t
y
check
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-30
Junio C Haman
o
g
it-p
i
ckaxe: r
e
fcount
origin
correct
l
y in find_c
o
py_in_parent()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-30
Ju
n
io C Hamano
g
i
t-pic
k
ax
e
:
a
llow
-Ln,m
a
s well
a
s -L n,m
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-29
Junio
C
Hamano
git-pic
k
axe: WIP t
o
r
e
f
coun
t
origin structur
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-29
J
u
nio C Hamano
Mer
g
e e
a
rly part of branch '
n
p
/
index-pack'
i
nto s
p
.
.
.
commit
|
commitdiff
|
tree
2006-10-29
J
unio C Haman
o
se
n
d-pack
-
-
kee
p
: do n
o
t
explode into loose objects
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Junio C Hamano
D
o
cumentation
:
f
i
x gi
t
-f
o
rmat-patch m
a
rk
-
up and link
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Ju
n
i
o C Haman
o
t6022
:
ignoring
u
ntracked files
b
y mer
g
e-recur
s
ive
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Ju
n
io C Hamano
me
r
ge-recu
r
sive:
adjust to loosened "working file clobbered
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Junio C Hamano
merge-recursive: make a few function
s
stati
c
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Junio C Hamano
merge-re
c
ursiv
e
:
u
s
e abbrevia
t
ed commi
t
object
n
a
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-28
Junio C Hamano
merge: loosen overcaut
i
ous "worki
n
g f
i
le will be l
o
st
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-27
Juni
o
C Hamano
tests: merge-recursiv
e
is usable
w
ithout Py
t
hon
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-10-27
J
unio C Hamano
Mer
g
e bra
n
c
h
'
j
c/reflog' into lj/
r
e
fs
commit
|
commitdiff
|
tree
2006-10-27
Jun
i
o C Hamano
M
e
rge bra
n
c
h
'jc/combined
'
into maint
commit
|
commitdiff
|
tree
2006-10-26
J
unio C H
a
mano
Merge branch 'jc/combined'
commit
|
commitdiff
|
tree
2006-10-26
J
u
nio C
Ha
m
ano
c
ombine-diff:
ho
n
our --no-c
o
mmit-id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-26
Junio C Hamano
combine-diff
:
fix hunk_comment_line
l
ogic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-26
Ju
n
io C Hamano
Merg
e
branch 'jc/combined'
commit
|
commitdiff
|
tree
2006-10-26
Junio
C Hamano
combin
e
-diff: a few more fini
s
hing touches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-26
Junio
C
Hamano
Docume
n
tati
o
n
: clarif
y
refna
m
e disambiguation rules
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-25
Junio C Ha
m
an
o
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2006-10-25
Junio C
H
amano
Docume
n
t
a
t
ion/Submit
t
ingPatches: 3+1 != 6
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-10-25
Junio C
Hamano
Merge branch 'aw/cvsimport'
commit
|
commitdiff
|
tree
next