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
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Ham
a
no
f
s
ck: d
o
not complain on detached HEA
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
M
e
rge br
a
nch '
m
a
int'
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hama
n
o
git-fet
c
h
:
use
f
e
t
ch--tool pick-rref to av
o
id local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
git-fetch--tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C
Hamano
t3030: merge-recursive backend test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
H
amano
merge-recur
s
ive: handle D/F con
f
lict case more carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merg
e
-re
c
ur
s
ive
:
do not barf
on
"to
b
e
r
e
mov
e
d
"
entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C Ha
m
ano
T
r
eat D/F conf
l
ict entry mo
r
e carefu
l
ly in unpack-t
r
ees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C
H
a
mano
t100
0
: fix case
t
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
shortlog -w: make
wrap-
l
ine behaviour
optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge branc
h
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
unio
C
Hamano
Merge br
a
nc
h
'jc/m
e
rge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge branch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C
Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
Ha
m
ano
Add Documentation
/
c
m
d-list
.
made to
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cycle by prepar
e
ing R
e
l
Notes fo
r
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C
H
amano
M
e
r
ge branc
h
'jc/read-tr
e
e
-df'
(
earl
y
par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge
b
r
a
nch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Prepare f
o
r
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new m
e
rge strag
e
ty
'
subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
git-push to mul
t
iple loca
t
ions does not
s
top at t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
git-push r
e
por
t
s the URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hama
n
o
M
erg
e
branc
h
'
jc/index-out
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
M
e
rge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge b
r
a
n
c
h
'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Ha
m
ano
Merg
e
branch 'jc/chec
k
out' (ea
r
l
y par
t
)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Document
a
tion: t
i
ghten dependency f
o
r g
i
t
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
git-b
i
se
c
t: allow
b
isecting
with only on
e
bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
t6030: add a bit
more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C Hamano
git-bisect: mode
r
nization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Merge br
a
nc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename add_file_to_ind
e
x()
t
o
a
dd_file_to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename
s
t
a
tic
vari
a
b
l
e write_index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Rename intern
a
l function "add_fil
e
_to_cach
e
" in bu
i
ltin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
am
a
no
Pro
p
agate cach
e
error in
t
e
r
n
al to refresh_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C
Hamano
Fix
bogus err
o
r messa
g
e
from me
r
ge-recu
r
s
i
ve erro
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix
d
ependency o
f
common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
RPM spec
:
includ
e
git-p4 in the
list of a
l
l packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere: m
a
ke sorting really s
t
able
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C H
a
m
ano
Fix switchi
n
g to a branch with D/F
w
hen current
b
ranc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix twoway_m
e
rge th
a
t
passed d/f confl
i
ct m
a
rker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C
H
a
m
ano
Fix read-t
r
ee --prefix=d
i
r/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
unp
a
ck-trees: get rid
of *indpos parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpac
k
_trees
.
c: pa
s
s unpack_trees_optio
n
s struct
u
re
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cache_entry(): removal of file foo does not c
o
n
flict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ham
a
no
Merge
b
ran
c
h
'
jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ham
a
no
Merge bran
c
h 'fl/doc
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Merge
b
r
anch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Me
r
g
e branch 'post1
.
5
.
1/
t
cltk
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Merge
b
ranch 'post1
.
5
.
1
/
p
4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Me
r
ge branch 'lt
/
d
irwalk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
H
a
mano
git-r
e
ad-t
r
ee
--inde
x
-output=<file
>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hama
n
o
_GIT
_
INDEX_OUTPUT: allow plumbing to output to an alternativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Ham
a
no
checkout: allo
w
d
e
taching to HEAD ev
e
n whe
n
sw
i
t
ching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
G
I
T
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
GIT
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere
s
hould not repeat t
h
e earli
e
r
hunks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
H
opefully final
u
p
date t
o
the draft Re
l
ease Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/Tk: ignore generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C H
a
mano
Do
n
ot bother document
i
ng fetch--
t
ool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
amano
Update draft rele
a
s
e note
s
for
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
M
e
r
ge
b
r
anch 'maste
r
' of
g
it://repo
.
o
r
.
cz
/
git/mergetool
.
g
it
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Doc
u
mentation: unbr
e
ak
user-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Ham
a
no
G
I
T
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
J
uni
o
C Hamano
Update main
gi
t
.
html page to point
at 1
.
5
.
0
.
6 documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
M
e
rge branch 'maint
'
to synchronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Ha
m
a
no
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Ha
m
ano
Fix "--
p
retty=format:"
f
o
r
p
a
r
ent rela
t
ed items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
g
i
t
-commit: "read-tree -m HEAD" is no
t
t
h
e right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
s
h
a1_file
.
c (
w
rite_sha1_file): Detect close failu
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Docum
e
n
t gi
t
-l
o
g --first-parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o
C
Hamano
G
IT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C H
a
mano
Me
r
ge bra
n
ch 'jc/
f
pl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C H
a
m
ano
Update README
to point at a
few key periodical messa
g
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Hamano
Merge
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C
H
amano
Merge branc
h
'maint' of git://linux-nfs
.
o
r
g/~bfield
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
erge
b
r
a
nch 'js
/
r
e
mote-show
-
p
ush'
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o
C H
a
m
a
no
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io C Hamano
git-am docume
n
tation: describe what is ta
k
en from where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
amano
make t
h
e previous optimization wo
r
k al
s
o
o
n
path-lim
i
t
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio
C Hamano
rev-list --bisect: Fix "halfway"
o
ptimiz
a
t
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio C Ha
m
ano
M
erge bran
c
h
'master'
i
n
t
o
jc
/
b
i
se
c
t
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio C Hamano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
F
ix path
-
limited "rev-list --bisect
"
termination
condit
i
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Jun
i
o C Ham
a
no
git-b
i
s
ect
.
sh:
p
r
operly dq $GIT_DIR
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
J
unio C
Hamano
gi
t
-bisect
:
ty
p
ofix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C H
a
mano
c
heckout:
report whe
r
e the new HEAD is upo
n
de
t
a
c
hing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
t6004:
a
dd a bit more path optimization test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
J
uni
o
C Haman
o
git-apply:
D
o
not
f
ree the wrong
buffer when we conv
e
rt
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Ha
m
ano
Merge git://git2
.
ke
r
nel
.
o
rg/p
u
b/scm/
g
itk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Haman
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-
r
eba
s
e: make 'rebase
H
EAD
b
ranch' work as expected
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ha
m
ano
g
it
-
rev-list
-
-
bisect: optimization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
mano
git-rev-l
i
s
t
: add --bisect-vars
option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Haman
o
t
6002: minor spelling fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next