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
Split out mailmap handling out of shortlog
2007-04-12
Junio C Hamano
M
e
rg
e
branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C H
a
mano
G
IT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio
C
H
amano
fsck: do not complain on det
a
c
h
ed HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
gi
t
-fetch:
u
se fetc
h
--
t
ool pi
c
k-rref to avoi
d
local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetch--t
o
ol pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
t3030: merge-recu
r
sive
b
a
cke
n
d test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C Hamano
me
r
ge-recurs
i
ve
:
hand
l
e D/F conflict case
m
ore carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merg
e
-recursive: do not barf on "to be removed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Haman
o
Treat D/F conflict
entry more carefully in unpac
k
-t
r
ees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
t1000: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
shortlog -w: make wrap
-
line be
h
avi
o
ur optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
b
r
a
n
c
h 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
man
o
Merge
b
ranc
h
'jc/merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
a
ma
n
o
Merge bran
c
h
'js
/
fetch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
H
a
mano
M
erge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add
Docum
e
n
t
ation/cmd-list
.
m
ade to
.
g
i
t
ig
n
ore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
ma
n
o
Start
1
.
5
.
2 c
y
cl
e
b
y prepare
i
ng RelN
o
tes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Mer
g
e branch 'jc/read-tree-df' (ear
l
y part)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
H
amano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepare for
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new
merge str
a
gety '
s
u
btree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C H
a
mano
gi
t
-push to mult
i
ple
locati
o
ns does not s
t
op at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push
r
e
ports the URL after
f
ai
l
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge bra
n
c
h
'
jc
/
ind
e
x-
o
utput'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
Merge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
M
erge branch 'cc/bise
c
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
M
e
rg
e
branch 'jc/
c
he
c
kout' (
e
arly p
a
rt)
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Do
c
umentation: tighten
d
ependency for git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C
Haman
o
git-bisect
:
allow bisecting wit
h
only one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
t
6
0
30: add
a b
i
t more tests
to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
u
n
io C H
a
mano
git
-
bi
s
ect:
m
ode
r
nizatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Merge
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename add_fil
e
_to_index
(
)
to ad
d
_file_to_
c
ache(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static variable write_index to
u
pdate_inde
x
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hama
n
o
Rename
internal
f
unction "add_file_to_cache"
i
n
buil
t
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C Hama
n
o
Pr
o
pagate
cache
e
rro
r
internal
t
o re
f
resh_ca
c
he() vi
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C
Hamano
F
i
x bo
g
us
e
rror message from mer
g
e
-
recursive er
r
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
i
o C Ham
a
no
Fix depend
e
ncy of co
m
mon-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
RPM sp
e
c
:
in
c
lu
d
e git
-
p4 in the
l
ist of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
rerere: make
sorting r
e
ally stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Fix
s
witching to a branch with
D
/F when current br
a
nch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
F
ix twowa
y
_merge that pa
s
sed d/
f
c
onflict
mark
e
r t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Fix read
-
tree
--
p
ref
i
x=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
un
p
ac
k
-trees: g
e
t
rid
of *indpo
s
paramete
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
unpa
c
k_tre
e
s
.
c: pass unpack_trees_options structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add
_
cach
e
_en
t
r
y(): removal of file foo
does not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Merge b
r
an
c
h 'jc
/
bi
s
ect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge br
a
nch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
M
e
rge
branch
'
post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Merge branch 'pos
t
1
.
5
.
1/tcl
t
k'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'p
o
st1
.
5
.
1
/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branc
h
'lt/di
r
walk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
amano
git-read-tree -
-
inde
x
-output=<file
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_
G
IT_INDEX_OUTPUT: allow plumbi
n
g
t
o
o
u
tput t
o
an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C
H
amano
ch
e
ckout: allow detaching t
o
HEAD even when
sw
i
tching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C H
a
mano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C Hamano
Merge 1
.
5
.
0
.
7
in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C Haman
o
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
r
erere shoul
d
no
t
repeat the ea
r
lie
r
hunks
i
n later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
J
u
n
io
C Hamano
Hop
e
ful
l
y final upd
a
te
to the draft
R
ele
a
se Note
s
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio
C
H
amano
Optio
n
al Tck/Tk
:
ignore generated
f
i
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
D
o not bother documenting f
e
tc
h
--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Update
d
raft release not
e
s for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Ham
a
no
Merge
b
r
anch
'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C H
a
mano
Merge branch 'mas
t
er' of git://
r
epo
.
or
.
cz/git
/
m
e
rgetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documentat
i
on:
u
nbreak user-m
a
nual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
I
T 1
.
5
.
1-r
c
3
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Ham
a
no
Update m
a
in gi
t
.
html page to point a
t
1
.
5
.
0
.
6 do
c
umentatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
uni
o
C Hamano
Merg
e
b
r
anch
'maint' to s
y
nchronize
with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
unio C H
a
mano
GI
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hamano
Fix "--pretty=
f
ormat:" for parent related
items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git
-
comm
i
t: "read-tree -m HEAD" i
s
not the right
way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
unio C Hama
n
o
s
ha1_file
.
c
(write_sha1
_
file): Detect
c
lose f
a
i
lure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Do
c
ument gi
t
-log
-
-first-pa
r
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
J
u
nio
C
Hamano
G
I
T 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Me
r
ge b
r
anc
h
'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Update README to poin
t
a
t
a few
key periodical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C Ham
a
no
Merge br
a
nch 'maint' of git://linux-nf
s
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ha
m
ano
Mer
g
e branch 'js
/
r
e
mote-show
-
push'
commit
|
commitdiff
|
tree
2007-03-25
Junio
C H
a
m
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io
C
H
amano
git-am documentation: describe what is t
a
ken from wher
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio C Ha
m
ano
make
t
he previous optimization work also on path
-
limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
J
uni
o
C Hamano
rev-list --
b
isect:
F
ix "halfway" opt
i
mization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o
C
Hamano
Me
r
ge b
r
anch 'master' i
n
to j
c
/bisect
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
no
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io
C
H
amano
F
ix path-lim
i
ted "re
v
-list --bisect
"
termination condition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Ha
m
ano
git-bisect
.
sh
:
p
rop
e
rly dq
$G
I
T_D
I
R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Jun
i
o
C Ha
m
an
o
git-bisect: typ
o
fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Juni
o
C Ha
m
ano
checkout: report
w
here
t
he
n
ew HEAD
is upon de
t
ac
h
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
t600
4
: add a
b
it
more path opt
i
mi
z
ation test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io C
Hamano
gi
t
-
a
pply: Do
not free t
h
e
w
rong
buffer when we
c
onver
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Merge g
i
t://g
i
t2
.
kernel
.
org
/
pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
am
a
no
git-rebas
e
: m
a
k
e 'reba
s
e
H
EAD branch' w
o
rk as
expect
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hama
n
o
gi
t
-rev-list --bisect: optimization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
g
it-
r
ev-lis
t
:
add --bisect-vars o
p
tio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
t
6
002: mi
n
or spelling fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next