repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
octopus: reenable fast-forward merges
2009-12-14
Stephen Boyd
octopus:
reenab
l
e fast-forward merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-14
Stephen Bo
y
d
octopus: ma
k
e merge proc
e
ss si
m
pler
t
o follow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
n
o
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o
C
Hamano
Fix arch
i
ve
f
ormat with -- on the c
o
mmand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hama
n
o
Remove
p
ost-upload-ho
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merge bran
c
h
'
mm/
m
aint-merge-ff-error-mes
s
ag
e
-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Merge branc
h
'jn/maint-pull-
r
eba
s
e
-error
-
mes
s
a
g
e
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
M
er
g
e branch 'jk/m
a
int-add-p-delete
-
fix' into maint
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-interactive
:
fix del
e
tion of non-empty
f
i
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C Ham
a
n
o
Gi
t
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linu
s
Torvalds
Fix diff -
B
/
--
d
ir
s
tat
m
i
scounting
o
f newly a
d
ded
c
ontents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jef
f
K
i
ng
reset: improv
e
worktr
e
e safety
valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
T
odd Zulli
n
ger
Documen
t
atio
n
:
Avoid use of xmlto --st
r
ingpa
r
am
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René S
c
harfe
archive: cla
r
ify
de
s
c
r
ipti
o
n
o
f path parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
r
ere
r
e
:
d
o
n't se
g
fault o
n
failure
to open r
r
-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Prep
a
re for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C H
a
mano
Mer
g
e br
a
n
ch 'uk
/
m
a
int-shortlog-encoding' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'fc/
m
aint-f
o
rmat-patch-pathspec-dashe
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch
'
ap/maint-
m
erge-strate
g
y-
l
i
s
t-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Merge branch
'jc/maint-am-keep' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
br
a
nch 'rs/work-ar
o
und-grep-opt-in
s
anity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge
branch 'r
j
/
maint-cygwin-count-object
s
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hamano
Merge
br
a
nc
h
'm
m
/maint-h
i
nt-failed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
M
e
rge bra
n
ch 'th/maint-remote-update-help-
s
t
ring' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'rj/maint
-
t97
0
0' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge bra
n
ch 'ls
/
m
a
int-mailinfo-
n
o
-
inb
o
d
y' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hama
n
o
M
e
r
g
e branch '
m
o/maint-crlf-do
c
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 't
h
/rem
o
t
e
-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'pb/ma
i
n
t-
u
se-c
u
stom-perl' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'mm/config-pa
t
hname-tilde-expa
n
d' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ham
a
no
Merge bran
c
h 'bc/grep-
i
-F' int
o
m
a
in
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'jk/mai
n
t-break-re
n
ame-r
e
d
u
ce-
m
emory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge
br
a
nch 'rj/mai
n
t-
s
i
m
plify
-
cygwin-ma
k
efile'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Haman
o
Merge b
r
anch 'r
g
/d
o
c
-workflow
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
Ham
a
no
Merge b
r
anch '
n
p/maint-sideband-favor-sta
t
us' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
D
o
c
umentation
:
xmlto 0
.
0
.
18
d
oes not know --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon
C
a
sey
t
4201: use ISO8859-1 rathe
r
than
ISO-
8
859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan Krüger
pull:
c
larify advice for
the
unc
o
nfi
g
ured error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hama
n
o
Unconditionally set m
a
n
.
base
.
u
r
l
.
for
.
rela
t
iv
e
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Haman
o
Doc
u
men
t
at
i
on/Makef
i
le: a
l
low man
.
base
.
u
r
l
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Hamano
Pr
e
pare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
a
n
o
merge:
d
o n
o
t a
d
d standard message when message
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o
C Hamano
Do not misi
d
entify "git
m
er
g
e foo HEAD" as an
old
-
st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
i
d Aguilar
h
e
l
p
: Do
n
ot unnecessarily look for a r
e
po
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
M
ichael J Gr
u
ber
Documen
t
ati
o
n: Fix a few i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
David S
o
ri
a
Parr
a
Do
c
umentation: Doc
u
ment --
b
ranch option
in
g
it clon
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu
M
oy
bu
i
ltin-merge: show user-friendly error
messages for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merge-recursive: make th
e
error-message generation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
A
v
ery Pennarun
builtin-me
r
ge
.
c: call exclu
d
e_cm
d
s
(
) correct
l
y
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Remove
d
ead code fro
m
"git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contrer
a
s
fo
r
mat-patch:
add te
s
t
f
or parsing of "--"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe
C
o
n
t
r
era
s
format-patch: fi
x
parsing
of "
-
-"
o
n the
command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
mano
builtin-appl
y
.
c: pay attention t
o
-p<n
>
wh
e
n
d
etermining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe
Kleine-König
shortlog: respect com
m
it
encodi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Nicolas Pitre
pack-
o
bjects: spl
i
t
i
mp
l
ications of --all-progress
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
S
t
ephe
n
Boyd
instaweb: r
e
s
t
art s
e
rver
if already running
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jeff Kin
g
pru
n
e-packed: on
l
y show p
r
ogress
w
hen stde
r
r is
a tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
i
o C
H
amano
Protect scripted Porcela
i
ns from GRE
P
_
O
PTION
S
insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René S
c
harfe
me
r
getool--lib: simplify
guess_merge_tool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
user-m
a
nual:
Doc
u
ment
t
hat "git merge
"
doesn'
t
l
i
ke
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
M
atthieu Moy
merge
-
recursive: point the user to
com
m
it when
f
ile
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
H
a
mano
Documen
t
a
t
ion: avoid xmlto
in
p
u
t
error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Raman Gu
p
t
a
A
dd branch management for releas
e
s to
g
itwork
f
lows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Lu
k
as Sand
s
tröm
git
am/mailinfo: Don't loo
k
at in-b
o
dy header
s
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
T
im Henig
a
n
g
i
t remote:
S
eparate u
s
age strings
for
s
ubcomma
n
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
diffcore-rename: red
u
ce memory foot
p
rint by fr
e
eing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
R
ams
a
y Jones
git-count-
o
b
j
e
c
t
s: F
i
x a dis
k
-space under-estimate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Greg Price
Documentat
i
on: undocument g
c
'd
f
unction graph_re
l
ease
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jon
e
s
t9
7
00-perl-git
.
sh: Fix a test failur
e
on
C
y
gwi
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-19
Mat
t
hieu Moy
e
x
p
a
n
d_user
_
pa
t
h: expand ~ to $HOME, no
t
to the actua
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-18
Matthieu Moy
Expan
d
~ and ~user in core
.
excludesfile, c
o
mmit
.
template
amended by
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Philippe Bruha
t
.
.
.
Make sure $PERL
_
PATH is defi
n
ed when the test sui
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Mat
t
hew O
g
ilv
i
e
co
r
e
.
autocrlf documentation: mention the crlf attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Brian
C
o
lli
n
s
g
rep: Allow case insensitive s
e
ar
c
h
o
f
f
ixed-str
i
ngs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
dif
f
core-break: save cnt_dat
a
f
or othe
r
pha
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Je
f
f King
diffcore-b
r
eak: free filespec data as
we go
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
unio C Hamano
G
it 1
.
6
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C
H
amano
M
e
r
ge bra
n
ch 'bs/main
t
-pre-commit-hook-sample'
into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ham
a
no
Merge bran
c
h
'jk/maint-add-p-
e
mpty'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2009-11-16
J
unio
C
Hamano
Me
r
ge branch 'js/m
a
int-
d
iff-color-words'
into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
e
rge
b
ranch 'tz
/
m
a
in
t
-r
p
m
'
into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Ham
a
no
Merge
br
a
nch
'j
k
/
maint-forma
t
-pat
c
h-p-suppress-stat
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Merg
e
branch 'pb/m
a
in
t
-
gitweb-bl
o
b-lineno' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge bran
c
h 'jk/main
t
-1
.
6
.
3-ls-files-i' into maint
commit
|
commitdiff
|
tree
2009-11-16
J
u
n
i
o
C
Hamano
M
erge bra
n
ch 'vl/main
t
-openssl-signature-ch
a
ng
e
' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C Hamano
M
e
r
g
e
branch 'jk/maint
-
p
ush-config' in
t
o maint
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o
C Hamano
Merge branch 'sr/b
l
ame-
i
ncomplete' into main
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hama
n
o
Merge b
r
anc
h
'
j
c/
m
ai
n
t-blank-at-e
o
f' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C
Hamano
M
e
rge branch 'jc
/
m
a
int-1
.
6
.
3-graft-trailing-space'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Merge
b
ranch
'
t
r/m
a
i
nt-roff-quote' int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
J
unio C Hama
n
o
Merge branch
'
ja/fe
t
ch-doc'
int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 'cb/do
c
-fetch-pull-merge'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C
Hamano
Merge b
r
anch '
j
k/ma
i
nt-cvsimport-pathnam
e
' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hama
n
o
Merge branch 'jc
/
recei
v
e-p
a
ck-auto' into maint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C
H
a
m
a
n
o
Merge branch '
g
b/maint-gitw
e
b-esc-param'
into main
t
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C H
a
mano
Merge bran
c
h '
j
n/gitweb-patch'
int
o
maint
commit
|
commitdiff
|
tree
2009-11-15
Tim Heni
g
an
Update 'git remot
e
update' usage string
t
o
m
a
tc
h
man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Todd Z
u
lling
e
r
Makefile: Ens
u
re rpm p
a
c
kag
e
s can be rea
d
by older
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Ste
p
hen
B
oyd
git-a
d
d
.
txt: fix forma
t
ting of
-
-patch
se
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next