repo.or.cz
/
git
/
gitweb.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 to re
m
ov
e
"
$GIT_DIR/MERGE_MSG
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
unpack-trees:
m
ake sure "df
_
conflict_entry
.
name" is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
receive-pack: do not
i
nsist o
n
fa
s
t-forward outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
tutorial: tal
k
a
bout us
e
r
.
name
e
arly a
n
d don't start
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
git b
l
a
m
e -C: fix outpu
t
f
o
r
mat
t
weaks w
h
en
c
rossing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
J
u
n
i
o C Haman
o
GIT
1
.
4
.
4
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
Junio C Hamano
trust-execut
a
ble-bit: fix
b
r
eakage fo
r
syml
i
nks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
Junio C H
a
mano
do_for
_
each_ref: perform the same sanit
y
check for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
Junio C Hamano
git-fet
c
h:
follow lightweit tags a
s
well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Junio C Hama
n
o
convert-objects: set _XOPEN_SOURCE t
o
600
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Junio C Hamano
git-checkout: allow path
s
pec to recover lo
s
t wor
k
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Junio C Hamano
git-checkout:
do not allow -f and -m
a
t
the sam
e
time
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Junio
C Ha
m
a
n
o
GIT 1
.
4
.
4
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-13
Ju
n
io C Hamano
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-11-12
Junio
C
Ha
m
ano
GIT 1
.
4
.
4-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-12
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-11-12
J
u
nio C Hamano
git-cvs
s
erve
r
: read from gi
t
with -z to get no
n
-
A
SCII
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-11
Junio C Ham
a
no
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-11-11
Junio C Hamano
path
-
list:
fix
pat
h
-list-inser
t
return value
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-10
Junio
C Hamano
git-
a
nnotate: fix -
S
on
g
raft file with
c
omments
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-10
Junio C
Haman
o
git-anno
t
a
t
e: no n
e
e
d
to exec blame; it
i
s built-in
.
.
.
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
Merge bra
n
ch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
Doc
u
me
n
tation: move b
l
ame exam
p
les
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
J
uni
o
C
H
amano
Merg
e
bra
n
c
h
'm
a
int
'
commit
|
commitdiff
|
tree
2006-11-09
J
u
nio C Hamano
gitweb: fix un
m
atched
d
i
v
in
commitdiff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
g
i
t
w
eb: prot
e
ct commit mes
s
ages from controls
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hama
n
o
gitwe
b
: protect b
l
o
b and diff
o
u
t
put
li
n
es fr
o
m con
t
rols
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio C
Hamano
g
it-pickaxe: retire p
i
ck
a
xe
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
Merge git://git
.
k
e
r
n
el
.
org/pub/s
c
m/gitk
/
gitk
commit
|
commitdiff
|
tree
2006-11-08
Junio C Ham
a
no
gi
t
-stat
u
s: quote
LF
in its output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Jun
i
o
C
H
amano
gi
t
web: do not give
blame lin
k
uncondit
i
onally in diff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio C
Hamano
git
w
eb: minimal
l
y
fix "fork" support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Ju
n
io C H
a
mano
g
itweb: fix di
s
abling of "f
o
rks"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Jun
i
o C Hamano
GIT 1
.
4
.
3-rc1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
J
u
ni
o
C Hamano
Mer
g
e branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-08
Junio C
H
amano
Merge branch
'jc/pic
k
axe'
commit
|
commitdiff
|
tree
2006-11-08
J
u
n
io C Hamano
g
i
t-pickax
e
: al
l
o
w
"-L <
s
ome
t
hing>,+N"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-07
Jun
i
o
C
Hamano
Merge branch
'jc/read-tree'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Haman
o
Merg
e
bran
c
h 'n
p
/in
d
e
x-pa
c
k'
commit
|
commitdiff
|
tree
2006-11-07
Juni
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Haman
o
git-p
i
cka
x
e: -L /
r
egexp
/
,/re
g
ex
p
/
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-06
Junio C Hamano
D
o
cu
m
e
n
t git-pa
c
k-refs and
l
in
k
it
t
o git(7)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-06
Junio C Hamano
a
d
j
ust_shared_perm: chmod()
onl
y
when neede
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hama
n
o
gi
t
-
pic
k
axe
:
optimize by av
o
iding rep
e
ated re
a
d_sha1_file()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
J
un
i
o C Haman
o
git
-
blame: add
i
nternal s
t
ati
s
tics to c
o
unt read blo
b
s
.
commit
|
commitdiff
|
tree
2006-11-05
Junio C
H
a
m
a
no
che
r
ry is built-in, do n
o
t ship g
i
t-cherry
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Ju
n
io C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-11-05
Junio C
H
a
mano
git-pick
a
xe:
f
ix
orig
i
n refcount
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hamano
Mer
g
e
branch 'np
/
verbose-push
'
commit
|
commitdiff
|
tree
2006-11-05
Juni
o
C Ham
a
n
o
Merge branch '
l
t
/
push-config'
commit
|
commitdiff
|
tree
2006-11-05
Junio C
Hamano
Merge branc
h
'pb/web'
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hamano
gi
t
-pickaxe: re-scan
t
he blob after ma
k
ing progress
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-04
J
u
nio C Hama
n
o
git-pickaxe:
re-scan the blob
a
fter making pr
o
gres
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-04
Junio C
H
aman
o
g
i
t
-picka
x
e:
s
i
mplify Octo
p
u
s
m
erges
f
ur
t
her
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-04
Jun
i
o
C Hamano
gi
t
-pi
c
k
axe: ren
a
me dete
c
t
i
o
n
optim
i
zation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-04
J
unio C H
a
mano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-11-04
Juni
o
C Ham
a
no
apply: han
d
le "traditional" creation/dele
t
i
on
d
iff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-03
Juni
o
C Hamano
Merge bran
c
h 'm
a
ster' into np/index-pack
commit
|
commitdiff
|
tree
2006-11-03
Junio C Hamano
Merge
br
a
nch 'sp/keep-pack' i
n
to np/index-pack
commit
|
commitdiff
|
tree
2006-11-03
Junio C
Haman
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-11-03
Junio C Hamano
for-eac
h
-ref: "creator" and
"crea
t
ordat
e
"
f
ields
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-01
Junio C
Hamano
Me
r
ge branch
'm
a
int'
commit
|
commitdiff
|
tree
2006-11-01
Junio C Hamano
branch: w
o
r
k
i
n
subd
i
rector
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-01
Junio C Haman
o
Merge branch 'rs/cherry'
commit
|
commitdiff
|
tree
2006-11-01
Junio C H
a
m
ano
Merge branch 'j
c
/refs-and-fetch'
commit
|
commitdiff
|
tree
2006-11-01
Junio C Haman
o
M
e
rge b
r
anch 'lj
/
ref
s
'
commit
|
commitdiff
|
tree
2006-10-31
Junio C H
a
mano
link_temp_to_file: don't leave the path
truncated on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-31
J
unio
C
Ha
m
ano
I
ntroduce
a new revi
s
ion set op
e
rator <r
e
v>^!
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-31
J
unio
C
Ham
a
n
o
git-pick
a
xe:
cache one already found path
p
er commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-31
Junio C Hama
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-10-31
J
u
nio C
Haman
o
revision trave
r
sal: --unpacked does not limit c
o
mmi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-31
Junio
C Ha
m
an
o
gi
t
-
pickaxe: split f
i
nd_origi
n
(
)
in
t
o find_rename(
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-31
Junio C Hamano
quote
.
c
: ens
u
r
e
the same
q
uoting a
c
ross p
l
atfo
r
ms
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-31
J
unio
C
Hama
n
o
Reve
r
t "send-pac
k
--
k
e
ep: do n
o
t explode into loose
.
.
.
commit
|
commitdiff
|
tree
2006-10-30
Junio
C
Hamano
S
urround "#define DEBUG 0
"
with "#if
n
d
e
f
DEBUG
.
.
#
endi
f
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-30
Junio C
H
aman
o
g
it-pic
k
a
x
e: tight
e
n
s
anity
c
hecks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-30
Junio C
H
amano
g
i
t-pickaxe: refcount o
r
igi
n
correctly in find_copy
_
in_paren
t
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-30
Juni
o
C Hamano
gi
t
-pi
c
kaxe: allow -Ln,m
a
s well as
-L n,
m
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-29
J
u
nio C Hamano
git-pickaxe: WIP t
o
refcount origin st
r
ucture
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-29
Junio C Hamano
M
e
r
g
e
e
a
rly
p
art of branch
'
np/index-pack'
i
nto s
p
.
.
.
commit
|
commitdiff
|
tree
2006-10-29
Ju
n
io C Hamano
send
-
pack --keep: do
n
ot
e
x
plode
i
nto l
o
ose obj
e
cts
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-28
J
u
nio C H
a
mano
Documen
t
ation:
f
ix gi
t
-format-patch mar
k
-up and
link
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-28
Jun
i
o
C
Hama
n
o
t6022: ignoring un
t
racked files by merge-re
c
ursive
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-28
J
unio C Hamano
merge-recursi
v
e: adjust to
l
oosen
e
d "
w
orking
f
i
l
e
c
lobbered
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-28
Ju
n
io C Haman
o
merge-recursive: make
a
few function
s
st
a
tic
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-28
Junio C H
a
mano
m
e
rge-recursive: use abbreviate
d
commit ob
j
ec
t
na
m
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-28
Junio C Hama
n
o
merge: loosen overcautio
u
s "working file
wil
l
b
e
lo
s
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-27
Junio
C
Hamano
tests: merge-recursive is usable without Python
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-27
Junio C Ha
m
ano
Merge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-10-27
Juni
o
C Hamano
Merge branch 'jc/r
e
flog'
in
t
o
l
j/refs
commit
|
commitdiff
|
tree
2006-10-27
Junio
C Ham
a
no
Merge branch 'jc/combined'
into maint
commit
|
commitdiff
|
tree
2006-10-26
Junio
C
Hamano
Merge branch 'jc/combined'
commit
|
commitdiff
|
tree
2006-10-26
Junio
C Hamano
c
ombine-
d
if
f
: h
o
n
our --no-co
m
mit-id
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-26
Junio
C
Hamano
c
o
m
bine-d
i
ff: fi
x
hunk_comment_li
n
e logic
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-26
Junio C
Hamano
Merge branc
h
'jc/comb
i
ned'
commit
|
commitdiff
|
tree
2006-10-26
Junio C Hamano
combine-di
f
f: a few
m
ore fini
s
hing touches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-26
Juni
o
C Hamano
Docum
e
n
tati
o
n: clarify refname
d
i
sambigu
a
tio
n
rules
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-25
Junio
C Hamano
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2006-10-25
Junio C Ham
a
no
Documentat
i
on/Submitti
n
gPatches:
3
+1
!= 6
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-10-25
Ju
n
io C
H
a
m
ano
Merge branch 'aw/cvsimport'
commit
|
commitdiff
|
tree
next