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
fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
2010-09-09
R
a
mkumar R
a
mac
h
a
n
dra
fmt_merge_ms
g
:
Change fmt_merge_msg API to acce
p
t
s
hort
l
og_len
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
ge scr
i
pt: learn --
[
no-]rer
e
re-aut
o
upd
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merge script: notic
e
@{
-
1} shorthand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e
s
c
ript:
h
and
l
e --no-ff --no-com
m
it
c
orrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scrip
t
: --ff-only to
disallow true me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: handle many
-
w
a
y oct
o
p
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge scr
i
pt
:
ha
n
d
l
e -m --log
c
orrect
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: forbid merge
-
s
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
th
a
n
N
ieder
merge
s
c
ript: allow custom s
t
ra
t
egies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
e
r
m
e
r
ge
s
c
ript: me
r
ge -X
<
option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
ge
s
cript: improve log me
s
sage subject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
ed
e
r
merge script: refuse to merge
dur
i
ng merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge sc
r
ipt: tweak unme
r
ged files message to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
script: --squ
a
s
h, --
f
f fro
m
unborn branch ar
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-
m
erge-msg -m to
overri
d
e me
r
ge ti
t
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
m
e
rg
e
-bas
e
-
-independ
e
nt
to print reduced parent l
i
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
-base --octopus to mimic sho
w
-branch --m
e
rge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
N
ie
d
e
r
Doc
u
menta
t
io
n
: add a SE
E
ALSO section for merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t6200 (fmt-merge-
m
sg):
s
tyle nitp
i
c
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010 (merge-
b
ase): moderni
z
e
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (
m
erg
e
):
t
est me
r
ge fr
o
m
bran
c
h yet t
o
be b
o
rn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t76
0
0
(merge):
c
heck reflog entr
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): do n
o
t
l
aunc
h
g
itk for
--de
b
ug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onath
a
n Ni
e
der
t76
0
0 (merge): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nied
e
r
m
e
rge: do
not mistake (an
c
es
t
or of
)
tag for branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
u
nio C Ham
a
no
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io
C Hamano
tes
t
s: c
o
rrect "d
o
es r
e
f
l
og exis
t
?" tes
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/: w
o
rk around one-sh
o
t variable assignment with test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/RE
A
DME: co
r
rect an e
x
ception wh
e
n
b
reaking a && chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541,lib-httpd}: replace pr
o
blematic '
!
()
'
notati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon C
a
sey
t/t3700: convert two u
s
es of negat
i
on op
e
rator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Juni
o
C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
d
o
n Casey
t/REA
D
ME: clarify te
s
t_must_fail d
e
sc
r
i
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
G
reg B
r
ockman
Check
size of
p
ath buff
e
r before writing into
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
Hamano
Merge branch
'
maint
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
upda
t
e-server
-
inf
o
: Shorten read_pac
k
_info_fi
l
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð B
j
armason
g
i
t add:
A
d
d --ignor
e
-
m
issing to SYN
O
PSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar Arnfjörð
Bja
r
m
a
s
o
n
gi
t
s
u
bmodule
a
d
d
:
R
e
m
ove
old d
o
c
s
abou
t
impli
c
it
-
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
ens Lehman
n
git submodule add:
R
equire the
n
ew --force
option t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge branch 'j
l
/add-n-
i
gnore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
Documentation: Expla
i
n
g
it-mer
g
etool's
use of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Merge bran
c
h
'
jc
/
diff-merge-bas
e
-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas R
a
st
Only run
aggre
g
ate-re
s
ults over actual co
u
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
ona
t
han
N
i
ede
r
Add
a sample user f
o
r
the svndu
m
p library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Hamano
diff A
.
.
.
B
: do
n
ot li
m
it the syntax t
o
o
narrowly
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge br
a
nch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C
H
amano
M
erge branch 'wp/m
e
rge-tree-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o C H
a
mano
Merge b
r
anch
'
js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
ni
o
C
H
a
mano
M
e
rg
e
branch
'
jc/diff-merg
e
-
base
-
mu
l
ti'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge branch 'ns/mer
g
e-re
c
ursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C
H
amano
Merge branc
h
'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'eb/d
o
c-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge branch 'j
n
/g
r
ep-o
p
en'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Ham
a
no
Merge branch
'mg/revisi
o
n
-
d
oc
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ranch
'
jk/maint-status-keep-index-timestam
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
branch
'jc/rebase-i
-
commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Ham
a
no
Merge branch 'ab/su
b
module-add-
f
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
a
n
o
Merge
b
ranch 'bc
/
maint
-
makefile-fixe
s
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
g
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-15
J
o
nat
h
an Nied
e
r
Document
a
tion: a
d
d su
b
module
.
*
t
o the bi
g
con
f
i
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
at
h
a
n
Niede
r
gitmodul
e
s
.
5:
u
rl can be a relativ
e
p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Su
n
kara
git
w
eb
:
fix esc_ur
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jo
n
athan
Nieder
git --paginat
e
: paginate
exter
n
al
comman
d
s agai
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay So
f
fian
MERGE_RR is i
n
.
git,
n
ot
.
git/rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will
Palmer
merge-tr
e
e: f
i
x w
h
ere two
b
ran
c
hes share no chang
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will
Palmer
add basic tests for merge-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Git
1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Merge
b
ranch 'jc
/
rea
d
-
tree-ca
c
he-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harinath
Use de
v
_t for device id (st_dev) from
s
tat in s
e
t
u
p
_
g
it_d
i
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
Hamano
diff A
.
.
.
B: g
i
ve one
possible diff wh
e
n
the
r
e
a
re more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Ha
m
ano
Merge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-13
Ore
n
Held
g
i
t fetch docum
e
ntation: d
e
scribe sho
r
t '-p' synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
M
i
kl
o
s Vajna
format-patch: docu
m
ent the
f
ormat
.
t
o
c
onfigurati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jen
s
Lehmann
git add: Add the
"
-
-ignore-mi
s
sing" option for t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gr
u
ber
t
e
s
t-lib: T
A
P com
p
l
i
an
c
e
for s
k
i
pp
i
ng tests on request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mi
c
h
a
el J Gruber
te
s
t-lib: simplif
y
GIT_
S
KIP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jun
i
o C H
a
mano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
J
ona
t
h
a
n Nied
e
r
t3000 (ls-files -o): m
o
dernize sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
F
redrik Skolm
l
i
Docu
m
entation: Spelling fix in protocol-c
a
pabilit
i
es
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Seb
r
ec
h
t
merge-rec
u
rsive:
use
"
up-to-
d
ate" instead of "u
p
to
d
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicola
s
Sebr
e
cht
che
c
kout: accord documentation to what
g
it
d
oes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Si
x
t
t0005: wo
r
k
around str
a
nge
$
?
in ksh when
p
rogram
t
erm
i
n
ated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Merge
rem
o
t
e branch 'ko/ma
s
ter' into
j
c/read-tree
-
ca
c
he
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
dif
f
.
c: fix a
grap
h
outp
u
t bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Æ
v
ar
A
r
nfjörð Bj
a
rmason
tests: Use sk
i
p_all=
*
to skip tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Juni
o
C
Ham
a
n
o
Fix "read-tree -m A B" pri
m
i
ng the cache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzila
y
R
eorganize `g
i
t-log' man
pa
g
e
to cl
a
rif
y
common d
i
ff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
N
a
zri
R
amliy
grep
-O: Do
n
ot pa
s
s
color
s
equences
a
s file
n
ames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C Hamano
Git
1
.
7
.
2-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Mer
g
e
branch 'ab
/
tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ham
a
no
Merg
e
br
a
nc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C Hamano
ba
c
kmer
g
e a
few mo
r
e fixes t
o
1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
Mer
g
e branch '
m
a
int-1
.
6
.
4'
into
main
t
commit
|
commitdiff
|
tree
2010-07-07
U
w
e Kleine-König
rev-parse: fi
x
--pars
e
-
o
p
t
--keep
-
das
h
dash --stop
-
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C
H
amano
M
erge branch 'mg/do
c
-
rev-par
s
e-
t
reepath-syntax' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'tr/receive-pac
k
-
a
liased-
u
pdate-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre
Habou
z
i
t
fix git
branch -m
in presence
o
f cross devices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brand
o
n Ca
s
e
y
t/
t
0006: sp
e
cify timezone
as
E
S
T5 not EST to co
m
ply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hama
n
o
do not
write
out inde
x
when status does n
o
t have to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C
H
amano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
next