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: Make 'merge.log' an integer or boolean option
2010-09-09
Ram
k
umar Ramachandra
m
e
rge: Make 'merge
.
lo
g
' an
i
nte
g
er or boolean option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachandr
a
merge: M
a
k
e '--log' a
n
integer o
p
t
ion for n
u
mber of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramk
u
m
a
r Ramach
a
ndra
fmt_merge_msg:
C
hange fmt_merge_msg API t
o
accept shortlog_len
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Niede
r
mer
g
e script: l
e
arn --[no
-
]rerere
-
autoupda
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge script: n
o
tice @{-1} sho
r
tha
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
m
e
rge script: ha
n
dle --n
o
-ff --no-commit correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n
Nieder
merge script: --
f
f-o
n
ly to
d
isallo
w
t
r
ue merg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Ni
e
der
merge script: handle
m
any-way
o
cto
p
us
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
m
e
r
ge script: handle -m --l
o
g
correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
mer
g
e scr
i
pt: f
o
rbid m
e
rg
e
-s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than Nieder
merge sc
r
ipt: allow custom strategi
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
ona
t
han Nieder
merge script: merg
e
-X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan
Nieder
merge s
c
ript: impr
o
ve log message subject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge scri
p
t
:
r
efuse to merge dur
i
ng merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scr
i
pt: tweak unme
r
ged
f
iles messag
e
to m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nie
d
er
m
e
rge sc
r
ipt
:
-
-
squas
h
, --ff from unborn branch
a
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Niede
r
f
m
t-me
r
ge-msg -
m
t
o override merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Ni
e
der
merge-base --independent to pr
i
n
t red
u
c
ed parent list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
Nieder
mer
g
e-base --octopus to mimic sh
o
w-bran
c
h --merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
Documentation: ad
d
a
SEE A
L
SO se
c
tion fo
r
merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t62
0
0 (fmt-mer
g
e-m
s
g
)
: sty
l
e nitp
i
cks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010
(merge-base
)
: modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nie
d
e
r
t7600 (mer
g
e):
t
e
st merge
from branch yet to be
b
orn
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n Ni
e
d
e
r
t7600 (merge): che
c
k
reflo
g
en
t
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t7600 (merge):
do not launch git
k
for
--debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
h
an Nie
d
er
t
7
600 (m
e
rg
e
): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
m
e
rg
e
: do n
o
t
m
istake
(
an
c
e
stor of
)
tag
for b
r
an
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C H
a
mano
Gi
t
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
u
n
i
o C Hamano
t
e
sts: co
r
rect "do
e
s reflog
e
xist?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
B
ra
n
don Casey
t/: w
o
rk around one-sho
t
va
r
iable assig
n
me
n
t w
i
th test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
ieder
t
/
README
:
correc
t
an exception when breaking a &&
chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
Casey
t/{t5541,lib-httpd}: r
e
place
p
roblematic
'
!()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
n
don Casey
t/t3700:
c
onver
t
t
wo uses of negation operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/READM
E
: clarify test_must_
f
a
il
descrip
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
C
h
ec
k
size of p
a
t
h
buff
e
r before writing
into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Haman
o
Merge
branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-19
R
a
lf Thielow
update-server-in
f
o
:
Sho
r
ten read_pack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æva
r
Arn
f
jörð
Bjar
m
a
son
git ad
d
: Add
--ignore-missing to SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
var Arnfjörð Bjarmason
g
it subm
o
d
u
le add:
Re
m
ove old docs about impl
i
cit
-f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Le
h
m
a
nn
git
submodule add: Require the new
--f
o
rce option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
M
erge branc
h
'jl/add-n-ignore-m
i
s
s
ing
'
commit
|
commitdiff
|
tree
2010-07-19
David A
g
uilar
Docu
m
entat
i
on:
E
xplai
n
git-mergetool's use of tempor
a
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
amano
M
e
r
ge branch '
j
c/diff-me
r
ge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thom
a
s
Rast
Onl
y
run a
g
gregate-resu
l
ts ove
r
actual co
u
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han Nieder
Add a sample
u
se
r
for the
svnd
u
m
p library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C Hamano
d
i
ff A
.
.
.
B: do not l
i
mit
t
he syntax too n
a
r
rowl
y
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge branch
'jn/p
a
ginate-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge br
a
nch 'wp/merge-tree-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge bran
c
h 'js/merge-r
r
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge branch '
n
s/merge-recurs
i
ve-upto
d
a
t
e'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
a
mano
Merge branch 'jn
/
tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hama
n
o
Me
r
ge b
r
anch 'eb/doc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
am
a
no
Merge
b
ranc
h
'
jn/g
r
ep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
ch 'mg
/
revisi
o
n-doc'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io C Hamano
Merge branch 'jk/maint-stat
u
s-keep-ind
e
x-t
i
m
esta
m
p'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge branch 'jc
/
rebase-i-commit-
m
sg-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C Ha
m
ano
Merge bran
c
h 'ab
/
submodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge branch 'bc/maint-ma
k
efile-fix
e
s'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C
H
amano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jona
t
han Nieder
Documentat
i
on: add submod
u
le
.
* to the
big con
f
iguration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nathan Ni
e
d
er
gitmodules
.
5
:
u
r
l can b
e
a
r
elative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pav
a
n Kum
a
r Sunkara
gitweb: f
i
x esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jo
n
a
than Nieder
git --pagina
t
e: paginat
e
external commands again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
ME
R
G
E_
R
R is in
.
git, not
.
g
i
t/rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
m
e
rge
-
tree: fix where
t
w
o
b
r
a
nches
s
hare no chan
g
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add
b
asic tests for merge-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
u
nio C Hamano
Git
1
.
7
.
2-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
unio C Hamano
Merge
b
ranch 'jc/re
a
d-tree-cache-tree
-
f
i
x'
commit
|
commitdiff
|
tree
2010-07-14
Ra
j
a R H
a
rinath
Use
d
e
v_t
f
o
r de
v
i
ce id (st_dev) from
stat in
se
t
up_gi
t
_dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
Hamano
diff A
.
.
.
B: give one
p
o
ssible diff when the
r
e are more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Ju
n
io
C
H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren He
l
d
git fetch documentation: describe
s
hort '-p' synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
M
i
klos Vajna
f
or
m
at-patch: docu
m
ent the format
.
to configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens L
e
hm
a
nn
git add: Add the "--ignore-mis
s
ing" option for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Micha
e
l
J Gruber
test-lib: TAP com
p
li
a
n
c
e
for sk
i
pping tests on request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Grub
e
r
test-
l
i
b: simp
l
i
f
y
G
IT_SKIP_TEST
S
loo
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
J
u
nio C Ha
m
ano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t3000 (ls-file
s
-o)
:
mode
r
n
ize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredr
i
k Skolmli
Documentation
:
Sp
e
llin
g
fix in protocol-capa
b
i
l
it
i
es
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
mer
g
e-recu
r
si
v
e:
u
se "up-
t
o-date" instead of
"
u
pt
o
date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
N
i
colas Sebrech
t
c
heckout: accord
d
o
cumentation to
w
h
a
t git do
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Sixt
t0005: work
around
s
t
range $? in
k
s
h when p
r
ogram
terminate
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio
C
H
amano
Merge
r
emote br
a
nch 'ko
/
master' into
jc/rea
d
-tree-cac
h
e
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
d
i
ff
.
c:
f
ix
a
graph output bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð Bj
a
rmason
tests: Us
e
s
k
ip_
a
ll=* t
o
skip test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ju
n
io C
H
amano
Fi
x
"read-tr
e
e -
m
A B" priming the cach
e
-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
R
e
organize
`git-log' man page
to clarify common diff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazri
Ramliy
gr
e
p -O:
Do not pass color sequences as filenames to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
a
mano
Gi
t
1
.
7
.
2-
r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Merg
e
branch 'a
b
/
t
a
p'
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Ham
a
no
Merge bra
n
ch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
backmerge a few more fi
x
es to 1
.
7
.
1
.
X
ser
i
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Ham
a
no
Merge branch 'main
t
-1
.
6
.
4' into m
a
int
commit
|
commitdiff
|
tree
2010-07-07
U
we Kleine-König
rev-
p
arse:
f
ix --parse
-
opt --keep-dashdash --stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch '
m
g/doc-r
e
v-parse-treepath-sy
n
tax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Hamano
Merge
branch 'tr/receive
-
pack-aliased-update-
f
i
x' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pi
e
rre Habouzit
fix
g
it branch -m in presenc
e
of cross devi
c
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
t/t0
0
06: specify timezone as EST5 not EST to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next