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
Merge branch 'maint'
2009-12-09
Junio C Ham
a
no
Merge bra
n
c
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2009-12-09
J
uni
o
C
Hamano
Merge branch 'mm/maint-merge-f
f
-
e
rror-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ha
m
ano
Merge
branch 'jn/maint-p
u
ll-rebase
-
error-m
e
ssa
g
e'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merge branch 'j
k
/maint-a
d
d-p-delete-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Ham
a
no
Merge git://git
.
bogomips
.
o
rg/git
-
svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
R
e
vert recent
"git merge <msg> HEAD <c
o
mmit>
.
.
.
"
d
eprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
J
e
ff King
add-interac
t
ive
:
fix deletion of non-empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
S
Z
ED
E
R Gábor
b
ash: up
d
a
te 'git commit' completio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C H
a
mano
Sync
wit
h
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
L
i
nus Torvalds
Fi
x
dif
f
-B/--dir
s
tat miscounting of newly added co
n
tents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff Kin
g
r
eset: impro
v
e worktree safety va
l
ves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
To
d
d Z
u
lli
n
ger
Documentation:
A
v
oid use of
x
mlto --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
R
ené Sc
h
arfe
arch
i
ve:
clari
f
y descr
i
ption of path parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
J
e
f
f King
rerere
:
don't seg
f
ault
on
f
ailu
r
e
t
o
open rr-ca
c
h
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Mer
g
e br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Pr
e
pare for
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
a
man
o
M
erge bra
n
ch 'uk/maint
-
shortlog-encoding'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Mer
g
e
b
ran
c
h 'fc/m
a
int-f
o
rm
a
t-patch-p
a
thspe
c
-da
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Ham
a
n
o
Merge
branc
h
'ap/maint-merge-strategy-li
s
t-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
amano
Merge
b
ran
c
h
'jc/mai
n
t-am-
k
eep' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
erge
b
ranch
'rs
/
work-around-grep-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'r
j
/maint-c
y
gwin-co
u
nt-objects
'
into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
ano
Me
r
ge br
a
nch
'
mm
/
maint-
h
int-failed
-
merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'th/mai
n
t-remote-update-h
e
l
p
-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
M
e
rge
branc
h
'rj/maint-
t
9
700' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Merge branch 'ls/maint-mailinfo-
n
o-inbody' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge br
a
nch
'
m
o/ma
i
nt-crlf-doc' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Merg
e
br
a
nc
h
'th/remote-usage'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'pb/ma
i
nt-
u
se-cu
s
tom-perl' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'mm/config-p
a
thname-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
M
e
r
ge branch 'b
c
/grep-i-
F
' into m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Merge bran
c
h '
j
k/main
t
-
b
reak-
r
ename-r
e
duce
-
memor
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
M
erg
e
bran
c
h 'rj/maint-sim
p
l
ify-cygwin-
m
akefile
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
erge bran
c
h 'rg/d
o
c
-
work
f
low' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
amano
Merge branch 'np/m
a
int-sideband-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jaku
b
Nare
b
ski
git
w
eb:
D
escribe (possible) gitwe
b
.
js min
i
fica
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Do
c
umen
t
ation:
xmlto 0
.
0
.
18 does not know --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jo
h
a
n
Her
l
and
Fix cra
s
her on encou
n
terin
g
S
H
A1-lik
e
non-no
t
e
i
n
n
o
tes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon
Casey
t
9
001:
u
se older Getopt:
:
Long
b
o
olean prefix '--n
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n Casey
t4201: use ISO885
9
-1 rather than ISO-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
a
n Krü
g
er
pull: c
l
arify advice
f
or
the unco
n
f
igured error c
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C
Ham
a
no
G
i
t
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Un
c
on
d
iti
o
n
a
lly s
e
t man
.
ba
s
e
.
u
r
l
.
fo
r
.
relat
i
ve
.
l
i
nks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
Hama
n
o
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Haman
o
Docum
e
ntation/Makefile: a
l
l
o
w m
a
n
.
base
.
url
.
for
.
re
l
a
t
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
amano
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Horst H
.
von Bran
d
git-p
u
ll
.
sh: Fix call to git-merge for
n
e
w command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio
C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Ham
a
n
o
Prepare
for
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
H
a
mano
merge: do not a
d
d stan
d
ard message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Hamano
Do not misidenti
f
y "git me
r
ge foo HEAD
"
as an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C H
a
m
a
no
U
p
date draft relea
s
e notes
t
o
1
.
6
.
6 befor
e
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
M
e
rge branch
'
jc
/
deprecate-old-
s
y
ntax-fr
o
m-me
r
ge'
commit
|
commitdiff
|
tree
2009-12-01
J
uni
o
C Hamano
g
i
t-merge: a
de
p
reca
t
io
n
notice
of the ancient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
erge br
a
nch 'bw/remote-get-r
e
f-states
-
fix'
commit
|
commitdiff
|
tree
2009-12-01
Bert Wesarg
get_re
f
_states: strdup entr
i
es
a
nd f
r
ee u
t
il in stale
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
i
d Aguilar
he
l
p: Do not u
n
necessar
i
ly look for
a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michae
l
J G
r
uber
Doc
u
mentati
o
n:
F
ix a fe
w
i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio
C Hamano
Me
r
ge
b
ranch 'jn/git
w
eb-blam
e
'
commit
|
commitdiff
|
tree
2009-12-01
Ja
k
u
b Narebski
g
i
tweb: Add link to other blame imp
l
ementa
t
ion
i
n blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jakub Narebski
g
i
tweb: Make linking t
o
action
s
re
q
ui
r
ing Ja
v
aScri
p
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Mer
g
e branch 'fc/maint-form
a
t-patch-p
a
thspec-das
h
es'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Ham
a
no
Merge branch 'mm/maint-merge-ff-erro
r
-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
Me
r
g
e branch 'ap/maint
-
merge-strategy-
l
ist-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
Merge branc
h
'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge branch 'cc/
b
isect-doc'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C
Hamano
M
erge bran
c
h 'em
/
commit-c
l
aim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
no
Merge
branch '
j
c/mailinfo-remove-b
r
ack
e
ts'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'
fc/send-email-env
e
lo
p
e'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bran
c
h
'
u
k/maint-shortlog-encod
i
ng'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Merge bran
c
h 'ns/send-e
m
ail-no-chain-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Me
r
ge branch
'
j
c/ma
i
nt-a
m
-
keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merg
e
branch 'bw/
d
iff-c
o
l
o
r-hunk-
h
e
a
der'
commit
|
commitdiff
|
tree
2009-11-30
Da
v
i
d
Soria
P
arra
Documentati
o
n
: Document --branch optio
n
in git
clone
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
builtin-merge: show
user-fr
i
end
l
y e
r
r
o
r m
e
ss
a
ges
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Mat
t
h
ie
u
Moy
mer
g
e-re
c
ursive: m
a
ke th
e
error-message
g
eneration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthew
O
gi
l
vi
e
t/README: Docum
e
nt GIT_TEST_IN
S
TALLED and G
I
T_T
E
ST_E
X
EC_
P
A
TH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Mat
t
hew Ogilvie
t3409 t4107 t7406 t9
1
50: use dashless
c
om
m
ands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Aver
y
Pennarun
b
u
iltin-merge
.
c: c
a
ll exclude_cmds(
)
corr
e
ctly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthew Ogilv
i
e
t2300
:
us
e
doc
u
mented technique
to invoke git-sh-setu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-29
Nanak
o
Shiraishi
prepare
s
end-email for sm
o
ot
h
er cha
n
ge of -
-
c
hain-
r
eply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
J
u
nio C Hamano
Upd
a
te draft
r
e
l
ease notes
t
o
1
.
6
.
6 before m
e
rgi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Jonathan Ni
e
d
er
Makefile: do not c
l
e
a
n arm d
i
rectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
B
e
rt Wesa
r
g
Give
t
he hunk
c
omment
its own color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
F
e
lipe Contreras
sen
d
-emai
l
: automatic en
v
e
l
o
p
e
s
ende
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Juni
o
C H
a
mano
emit_line(): don't emi
t
a
n
e
m
pty <SET
>
<RE
S
ET>
fol
l
owe
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ha
m
ano
Rem
o
ve dead cod
e
from "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
mano
Merge
b
ra
n
ch
'maint'
commit
|
commitdiff
|
tree
2009-11-27
Jo
h
an
n
es Sixt
Add a not
i
ce that only certain f
u
nction
s
c
a
n print
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
F
e
l
i
pe Contreras
form
a
t-patch: add test for parsing
o
f "-
-
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contr
e
r
as
format-patch: fix parsing of "--"
o
n
the
c
omman
d
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C Hama
n
o
builtin
-
apply
.
c: p
a
y a
t
tention to -p<n> when determ
i
ni
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
B
j
ö
r
n Gustavsson
gitworkflows: Consi
s
ten
t
l
y b
a
c
k
-quote g
i
t
commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
U
w
e
K
lei
n
e-Kön
i
g
sh
o
r
t
l
o
g
: re
s
pect co
m
mit encoding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hama
n
o
Merge
branch 'rs/work-
a
round
-
grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-25
B
e
n
j
amin Kramer
Ex
p
lici
t
ly tr
u
ncate bswap operand to
u
in
t
3
2
_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Stephen Boyd
git
w
eb
.
js
:
fix pad
L
eftS
t
r(
)
a
nd its usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next