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
Merge branch 'kk/maint-prefix-in-config-mak'
2011-05-16
J
u
nio C Ham
a
no
Merge branch 'k
k
/maint-prefix-in-config-mak
'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Ham
a
no
Merge br
a
n
c
h
'
m
g/merge-ff-c
o
nfig'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update draf
t
relea
s
e note
s
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Me
r
ge bra
n
ch 'jn/m
a
int-format-pa
t
c
h-do
c
' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge
bra
n
ch 'ss/che
r
ry-pick-x
-
d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branc
h
'
v
r/merge
-
base-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
br
a
nch 'sr/maint-fa
s
t-im
p
ort-t
i
ght
e
n-o
p
tion-parsi
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Haman
o
M
e
rg
e
bran
c
h 'jc
/
t1506-shell-pa
r
am-expansion-got
c
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io
C
Hamano
Merge branch 'j
c
/fix-ad
d
-u-unmerged' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C H
a
man
o
Merge bran
c
h
'jn/gitweb-depen
d
ency' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
M
e
rge
b
ranch 'jc/ma
i
nt-bra
n
ch-m
e
r
ge
o
ptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
M
e
r
ge br
a
nch
'j
c
/
m
a
i
n
t-add-p-overl
a
pping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
i
m
Meyer
i
ng
Documentation/git-fsck
.
t
xt: fix typo: unread
a
ble -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Sync rele
a
se notes for 1
.
7
.
6 to e
x
clude what a
r
e in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Haman
o
M
erge
b
ran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Update
d
raft
r
elease
n
ote
s
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge branch
'
cn
/
format-patch-quiet' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
aman
o
M
e
r
ge
b
r
a
n
ch 'jm/m
e
r
g
etool-submodul
e
s'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'j
k
/format
-
pat
c
h-quote-
s
pecial
-
in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C H
a
mano
Merge branch '
v
h/git-svn-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git
_
op
e
n_noa
t
ime(
)
:
drop u
n
u
sed parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
sha1_
f
i
l
e: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-05-15
Jonat
h
a
n
Nieder
add, merge,
d
if
f
: do n
o
t
u
se strcasecmp to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
Update draf
t
r
e
lease notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Ha
m
ano
Merge branch
'bf/commit-template-
n
o
-
cleanup
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/t1506
-
sh
e
ll-param-ex
p
ansi
o
n
-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o C Hama
n
o
Mer
g
e
b
r
anch 'rr/rerere-libify-clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rg
e
branch
'
js/ma
i
nt-send-pack-stateless-rpc-deadl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C H
a
mano
Merge branch 'jh/dirstat-li
n
es'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge b
r
anch
'
jc/
f
ix-
a
dd-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
Hamano
Me
r
ge branch 'jn/set
u
p-re
v
isi
o
ns-glob-and-fr
i
ends-pa
s
sthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
Merge branc
h
'cn/l
o
g-parse
-
opt
'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C H
a
mano
P
r
epare for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch 'aw/maint-r
e
bas
e
-i-p-no-ff'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
H
amano
Merg
e
br
a
nch
'
js/
b
lame-pars
e
name'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge branch '
g
r/
c
vsimp
o
rt-
a
lternativ
e
-cvspass-lo
c
ation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge bran
c
h
'
c
j/p4merge
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hama
n
o
Me
r
ge branc
h
'jk/
m
erge-one-fi
l
e
-
w
orki
n
g-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
am
a
n
o
Merge br
a
nch 'jc/fix-diff-files-
u
nmerged' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge branc
h
'mz/maint-rename-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Herla
n
d
t5400: Fix a couple of t
y
p
o
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
man
o
Mer
g
e bra
n
ch
'n
d
/struct-
p
at
h
spec'
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
nnes Six
t
Tweak t3102
-
l
s
-
t
ree-wildcard
s
to run o
n
Windo
w
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
m
a
no
U
pdate d
r
aft release not
e
s to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
M
e
rge b
r
anch 'j
n
/gi
t
w
e
b
-depend
e
ncy'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Ham
a
no
Merge
branc
h
'jc/mai
n
t-branc
h
-mergeoptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
mano
Merge br
a
nch 'j
n
/maint-test-merge-verify-pa
r
ents'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C
H
amano
M
e
r
ge
b
ranch 'v
h
/c
o
nfig-int
e
ractive-sin
g
lekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio
C
Hamano
Mer
g
e
b
r
an
c
h 'jc/maint-add-p-overlappin
g
-hu
n
k
s
'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
M
e
rge branch 'sr/maint-fast-import-t
i
g
hten
-
option-pa
r
sing'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
io C Ham
a
no
Merge branch 'dm/htt
p
-c
l
e
anu
p
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
M
e
rge br
a
nch 'jn/
c
tags'
commit
|
commitdiff
|
tree
2011-05-11
Bo
r
is
F
a
u
re
Do not strip emp
t
y lines /
trail
i
ng spaces from a
c
ommit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Johannes Sixt
Honor $(pre
f
ix)
set in co
n
fig
.
mak*
w
hen definin
g
E
T
C_GIT
*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
Hamano
Revert "Hono
r
$(
p
refix)
set in
config
.
m
ak* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hama
n
o
t
150
7
:
a
void "${p
a
rameter<op>'wor
d
'}"
inside dou
b
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
io C Hamano
t
3
701:
a
dd-p-fix make
s
the la
s
t
test to pa
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jun
i
o C Hamano
r
erer
e
: libify rere
r
e_clear
(
) an
d
rerere_gc()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remove gitweb/git
w
eb
.
cgi and
o
ther legac
y
targets from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub N
a
r
ebski
git-instaweb: Simplify build depend
e
nc
y
on gitweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonat
h
an Niede
r
tests: check git
does not
b
a
r
f on m
e
rge
.
ff va
l
ues fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jona
t
han
N
ieder
t
e
sts: teach verify_parents to check
f
or
extra
p
arents
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
merge: introduce mer
g
e
.
ff configuration varia
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o
C
Ha
m
ano
Merge b
r
anch '
j
c
/
main
t
-
branch-me
r
geopti
o
ns' in
t
o
mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
me
r
ge: m
a
ke branch
.
<name>
.
mergeoptions
correc
t
l
y ove
r
rid
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
onathan Nieder
tests: eli
m
inate un
n
ecessary
s
e
t
up test assertio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Haman
o
Update
d
raft releas
e
notes t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
a
m
a
no
Merge
bra
n
ch 'jn/run-command-e
r
ror-failure'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C
H
amano
Merge
b
ran
c
h 'js/info-man-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'im/has
h
cmp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge branch '
j
k/
m
erge-one-fi
l
e-working-
t
ree'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Ha
m
ano
M
erge bran
c
h 'jc/f
i
x
-diff-fil
e
s
-
unmerged'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge branch 'cj/p
4
merge'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Mer
g
e branch 'gr/cvsimport-alternative-cvspass-loca
t
ion'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C H
a
mano
Merge branch 's
g
/comp
l
etion-clean
u
p
'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C
H
amano
Merge br
a
nch 'js/blam
e
-
par
s
ename'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge bran
c
h
'jk/
f
ormat-patc
h
-
quote-special-in-
f
r
o
m
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge bran
c
h 'nd/stru
c
t-pathspe
c
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
Merg
e
branch 'aw/maint-reb
a
se-i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Hamano
M
e
r
ge branc
h
'm
g
/
a
lias-e
x
pose-pref
i
x'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Mer
g
e branc
h
'
m
g/diff-uiconf
i
g-doc'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C
H
amano
Me
r
ge br
a
nch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-06
João
B
ritto
R
emo
v
e
duplica
t
e
d
"is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rab
b
eli
e
r
fast
-
i
mp
o
rt: fix opti
o
n parser for no-arg options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Hamano
Merge branch
'
j
s
/maint-1
.
6
.
6-s
e
nd-pac
k
-s
t
a
t
e
l
ess-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff Ki
n
g
send-p
a
ck
:
unb
r
eak push ov
e
r
statel
e
s
s
rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
V
a
lentin Haenel
git-reset
.
txt:
bett
e
r docs for '--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haenel
git
-
checkout
.
txt: better docs for '--pa
t
c
h'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin
Haenel
g
it-
s
tash
.
txt: better d
o
cs for '--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin
Haene
l
git-add
.
txt: document '
i
nteractive
.
s
i
n
glekey'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
V
alentin Haenel
config
.
txt: 'in
t
eractive
.
s
i
n
glekey;
is used
b
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C
Hamano
t370
1
: fi
x
he
r
e d
o
cum
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J G
r
uber
git-fast-import
.
txt: --
r
elat
i
ve-marks takes no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shell:
a
d
d
missing initia
l
i
z
ation of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
r
ian Gernhar
d
t
t/annotat
e
-tests: Use echo & cat inst
e
a
d of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ha
m
ano
Updat
e
d
r
aft release n
o
tes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next