repo.or.cz
/
alt-git.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
Ra
m
kumar
R
am
a
c
handra
me
r
ge:
Make 'merge
.
l
o
g' an integer or
b
oolean opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Rama
c
handra
merge: Make
'
--
l
o
g' a
n
integer option for numb
e
r of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ra
m
achan
d
ra
fmt_
m
erge_m
s
g: Chan
g
e fmt_me
r
g
e_
m
sg
A
PI to accept shortlog_le
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Niede
r
merge
s
cript: learn
--[no-]rerere-autoupda
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
th
a
n Nieder
merge script: n
o
t
i
ce @{-1} shorthand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
m
erge script: handle -
-
n
o
-ff
-
-no-commit
c
orrect
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merg
e
sc
r
ipt: --ff-only to d
i
s
al
l
ow
t
rue merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan N
i
eder
merge scri
p
t: handl
e
many-way o
c
topus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scr
i
pt:
handle
-m -
-
log correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cri
p
t
:
forbid mer
g
e -s
index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
ge scr
i
pt: allow cu
s
tom str
a
t
egies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nie
d
e
r
merge script: me
r
ge -X<opt
i
on>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
me
r
ge
script:
im
p
rove lo
g
message
s
ubjec
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge
script: refuse
t
o merge during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script:
t
weak unmerg
e
d files
m
ess
a
ge t
o
match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nied
e
r
m
erge s
c
ri
p
t: --sq
u
as
h
,
--ff fr
o
m un
b
orn branch
are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
f
mt-merge-msg -
m
to o
v
e
r
ride merge
tit
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
ge-base --independ
e
n
t
to
p
rint
r
e
duced parent
l
ist
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
eder
merge-
b
ase
-
-octopus to mimic s
h
o
w
-branch --merge-bas
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
Documentation: add a SE
E
A
L
SO
s
e
c
t
ion
f
or merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
t6200
(
fmt-merge
-
msg): sty
l
e nit
p
icks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nied
e
r
t6010 (merge-ba
s
e)
:
moder
n
ize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
ha
n
Ni
e
der
t7
6
00 (merge)
:
test
merge from branch yet to be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
t76
0
0 (merge): check reflog entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): do not launch gi
t
k for --debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
Nieder
t7600 (merge): moderniz
e
st
y
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
ed
e
r
merg
e
: do not mistake (
a
n
c
e
s
tor
of) tag for br
a
n
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C Ham
a
no
G
i
t 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C
Hamano
tests: correct "does reflog
e
xist?
"
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t
/: work around o
n
e
-
shot
v
a
riable ass
i
gnment with test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/R
E
ADME: corre
c
t
an excepti
o
n when breaki
n
g
a &&
c
hai
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541,lib-
h
ttpd}
:
r
eplace
proble
m
a
tic '!()' notatio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
B
ra
n
don Case
y
t/t3
7
00: co
n
vert t
w
o uses of negatio
n
o
perator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Ham
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
don Casey
t/README: clar
i
f
y
test
_
m
u
st_f
a
i
l
d
e
sc
r
iptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Check
s
ize of
path
buffe
r
before
writing into
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Ha
m
ano
Mer
g
e b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf T
h
ielow
update-server-info: Shorten
rea
d
_p
a
ck_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð
Bj
a
rmason
git
a
dd: Add -
-
ignore-m
i
ssing to SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æva
r
Arnfjörð Bjarmason
git submodule a
d
d: Remove
old docs
a
bout implic
i
t -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
e
ns
Lehm
a
nn
git submodule add: Require the new --force
o
p
tion
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Ha
m
a
n
o
Merge br
a
n
ch 'jl/add
-
n-ignore-missing
'
commit
|
commitdiff
|
tree
2010-07-19
David Ag
u
i
lar
Docu
m
entatio
n
:
E
x
plai
n
git-merg
e
t
ool's
u
se of te
m
p
o
r
a
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Ham
a
no
Me
r
ge
branch 'jc/diff-m
e
rge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Ras
t
Onl
y
run
a
gg
r
egat
e
-r
e
sults o
v
er actual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan N
i
eder
Add
a
sample user for t
h
e s
v
ndump
l
ibra
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
Ham
a
no
d
i
f
f
A
.
.
.
B: do not limit the synt
a
x
t
oo n
a
rr
o
wly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch
'
j
n
/pagin
a
te-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
an
c
h 'wp/merge-
t
ree-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge branch 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge br
a
nch
'jc/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C Ha
m
ano
Merge
b
ranc
h
'ns/merge-rec
u
rsi
v
e-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
M
erge branch 'j
n
/
t
ests'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
M
e
rge
b
ran
c
h 'eb/doc-log-ma
n
pag
e
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge bra
n
ch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Me
r
ge branch 'mg/revision-doc
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Haman
o
M
erg
e
branch 'jk/maint-status-keep-index-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge branc
h
'jc/rebase-i
-
commit
-
msg-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge br
a
nch 'ab/s
u
bmo
d
ule-
a
dd-f'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
M
erge branch
'
bc/maint-makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan Nieder
Documentation: add s
u
bmod
u
le
.
*
t
o the big configu
r
ati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gi
t
modules
.
5: url ca
n
b
e a r
e
l
ative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kuma
r
Sunkara
g
i
tweb: fix es
c
_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
o
nathan N
i
eder
gi
t
--pagina
t
e: paginate ex
t
er
n
al
c
ommands again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soff
i
an
ME
R
GE_RR 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-
t
re
e
: fix wher
e
t
wo
b
r
a
n
c
h
e
s sh
a
re no changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Wi
l
l
Palmer
add bas
i
c te
s
ts fo
r
m
erge-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
u
nio C Ha
m
ano
G
i
t 1
.
7
.
2
-
r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hama
n
o
Merge branc
h
'jc/read-
t
ree-cach
e
-tree-f
i
x'
commit
|
commitdiff
|
tree
2010-07-14
Raja R
H
arinath
Use d
e
v_t for device
id (st
_
dev
)
from stat in set
u
p_
g
it_dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C H
a
m
a
n
o
diff A
.
.
.
B: give o
n
e possible diff whe
n
t
h
ere are more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-13
O
r
en
H
eld
git fe
t
ch docu
m
entation: describ
e
s
h
ort '-p' synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
M
i
klos Vajna
format-patch: do
c
u
men
t
the format
.
to co
n
f
i
guration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Leh
m
ann
g
i
t
add:
A
d
d
the
"--igno
r
e-missing" option for t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael
J
Gru
b
er
test-lib:
T
AP c
o
mplianc
e
for ski
p
pin
g
t
e
s
t
s on
r
e
q
uest
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael
J
Gruber
test-lib: si
m
plify
GIT_SKIP_TES
T
S loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Ju
n
io C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t30
0
0 (
l
s-
f
iles -o)
:
m
odernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredr
i
k Skolmli
D
o
c
umentation: Spel
l
ing fix in protocol-cap
a
bilitie
s
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
mer
g
e-
r
e
cursiv
e
: use "up-to
-
date" instead o
f
"uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ni
c
ola
s
Sebrech
t
checkout
:
accord
d
ocumentati
o
n t
o
w
h
at
git does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Sixt
t0
0
05: work
a
round strange $
?
in ksh wh
e
n program term
i
nat
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ju
n
io C Hamano
M
e
rge remote branch 'ko/ma
s
ter
'
into jc/rea
d
-t
r
ee
-
cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o
Yang
d
iff
.
c
:
fix a
graph output bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Ar
n
f
j
örð Bjarmason
t
es
t
s:
U
se skip_all=*
to skip tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ju
n
io C Ha
m
ano
Fix "read-t
r
e
e -m A B" primi
n
g the cach
e
-tre
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
Reorgan
i
ze `git
-
log' man page to cla
r
ify common di
f
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -O: Do
n
o
t
pass color sequences as fil
e
names
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
uni
o
C Hamano
Git 1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
Merg
e
br
a
nch 'a
b
/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
Merge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C
H
aman
o
b
ackm
e
rge a
few more
f
i
xes to 1
.
7
.
1
.
X series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
i
o
C Hamano
Merge branch 'maint-1
.
6
.
4'
i
nto maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kl
e
ine-Kö
n
ig
rev-p
a
rs
e
: fix --p
a
rs
e
-o
p
t --keep-dashdash --stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C
H
amano
Merge bran
c
h 'mg/
d
oc-rev-parse-treepath-syntax
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'tr/receive-pack-
a
liased-update-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pi
e
rre Habouzit
fi
x
git br
a
nch -m in pr
e
sence of cross devices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brandon
Ca
s
ey
t/t0006:
s
pecify timezone as EST
5
not E
S
T
t
o comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next