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 script: handle --no-ff --no-commit correctly
2010-08-18
Jonathan Nieder
merge scrip
t
: handle -
-
no-ff --no-commit correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
merge sc
r
ipt: -
-
ff-o
n
l
y
to disallow true merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Ni
e
d
er
merge script: hand
l
e many-w
a
y
octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge s
c
r
i
pt:
h
and
l
e -m --lo
g
correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Niede
r
m
erge s
c
r
i
p
t
:
f
orbid merge -s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n
Nieder
m
erge script: allow cust
o
m stra
t
egies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merge script: merge -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
Nieder
merge scri
p
t: imp
r
ove log m
e
ssage sub
j
ect
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge script: refuse to
merg
e
du
r
i
n
g me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
N
ied
e
r
merge s
c
ript: tweak un
m
er
g
ed fil
e
s message to
m
atch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
merge script: --squa
s
h, -
-
ff
f
r
o
m unborn branch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Ni
e
d
er
fmt-merge-msg -m to override
m
erg
e
title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge-base --indep
e
n
d
e
nt to print reduced parent
l
ist
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge-
b
ase --octopus to mimic sho
w
-bra
n
ch -
-
merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nie
d
er
D
o
cumentation: add a SEE
A
LSO section for merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Nieder
t
6
20
0
(fmt-merge-msg):
s
ty
l
e nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
t
6010
(
merg
e
-base): modernize
s
tyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t7
6
00 (merg
e
): test merge fro
m
b
ranch yet to be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
t
han Nieder
t
7600 (merg
e
): chec
k
re
f
log en
t
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
t7600 (me
r
ge): do not lau
n
ch
git
k
for
--debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t
7
6
00 (merge): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
ge: do not mistake (ancestor of
)
ta
g
for branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C Haman
o
G
it 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Juni
o
C H
a
m
a
n
o
te
s
ts: correct
"
does ref
l
og
e
xist?
"
test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Bran
d
o
n Casey
t/: wo
r
k around one
-
shot
v
ari
a
b
l
e assignment wit
h
test_mus
t
_
fa
i
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/RE
A
DME: corr
e
ct
a
n exception
w
he
n
br
e
aking a
&
& chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brando
n
Cas
e
y
t/
{
t5541,lib-ht
t
pd}
:
replace
p
roblemat
i
c
'
!()' nota
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t3700: convert
two
u
ses
o
f negatio
n
oper
a
tor '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Br
a
ndon Casey
t/R
E
ADM
E
: clarify test_m
u
st_
f
ail
d
e
scr
i
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
Brockman
Check siz
e
of path buffer before w
r
iting into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
io C Hamano
Me
r
g
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
T
hielow
u
pd
a
te-server-info: Shorten read_pack_inf
o
_file
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
Arnfjörð Bjarmason
g
i
t add: Add --ignore
-
missing to
S
YNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjö
r
ð Bjarmason
git
submodule a
d
d:
Remove old docs about implici
t
-f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens
Le
h
mann
git submodule add: Require
the n
e
w --fo
r
ce opti
o
n to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C H
a
mano
Merge
b
r
anc
h
'jl/ad
d
-
n-ignore-miss
i
n
g
'
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
Documentat
i
o
n: Explain git-m
e
rgetool's u
s
e o
f
t
e
m
porary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
ni
o
C Hamano
Merge bra
n
ch 'jc/di
f
f
-
merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thoma
s
Rast
Only run agg
r
egate-results o
v
er actual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
N
ieder
Add
a sample
user for the svn
d
ump
l
ibrary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff A
.
.
.
B: do not
l
imit the syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io C
H
ama
n
o
Merge branch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Merge branch 'wp
/
merge-tree-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge
b
ranch 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Ham
a
no
Merg
e
b
r
anch 'j
c
/
diff-m
e
rge-
b
ase-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
M
erge br
a
nch 'ns/merge-recurs
i
ve-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge
bran
c
h
'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
n
o
Me
r
ge b
r
anc
h
'
e
b/doc-
l
og-manpage'
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C
Hama
n
o
Merge branch 'jn
/
grep-
o
pen'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge bra
n
ch 'mg/r
e
vi
s
io
n
-
doc'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge branch 'jk/maint
-
stat
u
s-keep-index-timest
a
m
p
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
M
e
rge
branch
'jc
/
rebase-i-com
m
it-msg-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Me
r
ge branch 'ab/submo
d
ule-add-
f
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e
branch 'bc/
m
aint-
m
ak
e
file-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o C Ham
a
no
Merge
b
ra
n
ch
'main
t
'
commit
|
commitdiff
|
tree
2010-07-15
J
o
n
athan N
i
eder
Docume
n
tation: add submodule
.
* to the big
conf
i
guration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan N
i
eder
git
m
od
u
les
.
5
: ur
l
can be
a re
l
ative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pava
n
K
u
mar Sunkara
gitweb: fix esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jon
a
t
h
an Nieder
gi
t
--pa
g
i
nate: pagin
a
t
e ex
t
ernal c
o
mmands again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay So
f
f
i
an
MERGE_RR
i
s
i
n
.
git, not
.
git/
r
r-c
a
che
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Pa
l
mer
merge
-
tree: fix wh
e
re two branches
s
h
are no changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palme
r
add bas
i
c tests
for
m
erge-
t
ree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jun
i
o C
H
amano
Git
1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Ham
a
n
o
Merge b
r
an
c
h
'
j
c
/re
a
d
-tree-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Har
i
nath
U
se
d
ev_t for device id (st_dev) from stat in
s
etup_g
i
t
_
dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio
C Ha
m
a
n
o
diff A
.
.
.
B: give
one possible diff w
h
en there a
r
e more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C H
a
mano
Merge br
a
nch
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git fetch documenta
t
ion: descri
b
e short '-p' synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vajna
format-patch: docum
e
nt t
h
e format
.
to configurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
J
ens Le
h
m
a
nn
git
add: Add
t
he
"
-
-ignore-missin
g
"
opti
o
n
f
or the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
i
ch
a
el J Gruber
te
s
t-lib
:
TAP compli
a
nce for
skipping tests on request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Mich
a
el
J Gr
u
ber
t
e
s
t-lib: simplify GIT_SKI
P
_
TESTS loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio
C Hamano
Me
r
ge branch 'maint
'
commit
|
commitdiff
|
tree
2010-07-12
Jo
n
a
than Nieder
t3000 (ls-files
-o): mod
e
r
nize s
t
yle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fre
d
r
i
k Skolmli
D
ocume
n
tation: Spel
l
i
n
g f
i
x i
n
p
rotoco
l
-capabilities
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
merge-recursive: use "up
-
to-da
t
e
"
instead of "upt
o
date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
N
i
co
l
a
s
Sebrecht
checkout: a
c
cord d
o
cumentati
o
n to what
git does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Joh
a
nnes Sixt
t
0
005: wo
r
k around
strange $?
i
n k
s
h when pro
g
ram terminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Haman
o
Merge remote bra
n
ch 'ko/
m
aster'
into j
c
/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo
Yang
d
iff
.
c: fix a graph ou
t
p
u
t bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfj
ö
rð Bjarma
s
on
t
ests: Use sk
i
p_al
l
=* to
s
kip tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Haman
o
F
i
x "read-tree -m A
B
"
priming the cac
h
e-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzil
a
y
Reo
r
g
anize `git-log' man page to c
l
arify commo
n
diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
N
a
zr
i
Ramliy
grep -
O
: Do not pass color sequences
a
s f
i
lenames to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
a
m
ano
G
i
t 1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Mer
g
e br
a
nch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hama
n
o
backmerge a fe
w
more fi
x
es
to 1
.
7
.
1
.
X series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch '
m
aint-1
.
6
.
4' into
m
a
in
t
commit
|
commitdiff
|
tree
2010-07-07
Uwe
Kleine-Köni
g
re
v
-par
s
e: fi
x
--parse
-
opt -
-
k
e
ep-dash
d
ash --stop-
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Ha
m
ano
Merge branc
h
'mg/doc-rev-parse-treepath-syntax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Hamano
Merge b
r
a
nch
'
t
r
/receiv
e
-
p
a
c
k-aliased-update-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Habouz
i
t
fix git
branch -m in presence of cross
d
evices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
t/
t
0
0
06: specify timezone as EST5
not EST t
o
comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
a
mano
do not writ
e
out i
n
dex
w
hen status does
not
h
ave
to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-07
Heiko
V
oigt
add missing &&
t
o
s
u
b
m
odule-me
r
ge testcas
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jona
t
han Ni
e
der
t
/
R
E
ADME: documen
t
mo
r
e
test
h
elp
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
B
randon
Ca
s
ey
Mak
e
fi
l
e: wo
r
k ar
o
und ks
h
's failure
to handle m
i
ssing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next