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
Ramkumar Ramachand
r
a
mer
g
e: Make 'merge
.
log
'
a
n integer o
r
boolean op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachandra
me
r
ge: Make '--log' an intege
r
option for numbe
r
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
R
a
mkumar Ra
m
achandr
a
fmt_merge_msg: Change fmt
_
merge_msg API to acc
e
p
t shortlog_
l
en
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
th
a
n
Nied
e
r
merg
e
scri
p
t: learn --[no-]rerere-a
u
to
u
pdate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge sc
r
i
p
t: no
t
i
c
e
@{
-
1} shorthand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than Nieder
merge s
c
r
ipt: handle
-
-no-ff -
-
no-com
m
i
t
correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
i
ede
r
merge script:
--ff-only to disal
l
o
w
t
rue
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an N
i
eder
mer
g
e script
:
h
a
ndle many-way octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Ni
e
de
r
m
erge script: handle
-m
-
-log
c
o
rrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge
script: forbid merge -s index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
script: allow c
u
sto
m
s
t
ra
t
egies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
me
r
ge script: merge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nie
d
er
merge script: improve log mes
s
a
ge s
u
bject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge script: refuse to merg
e
du
r
ing me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge script: tweak unme
r
ged
fi
l
es message to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Ni
e
d
er
m
e
rge script:
-
-squ
a
sh, --ff from unborn bran
c
h are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Nied
e
r
fmt-me
r
ge-msg -m to overr
i
de
merge ti
t
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
m
erge-base --
i
ndependent to pri
n
t reduced parent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-base -
-
oc
t
opus to mimic
show-branch --
m
erge
-
b
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nie
d
er
Documenta
t
io
n
: add a SEE ALSO section for
m
e
r
ge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t
6
200 (fmt-merge-msg): style nitpi
c
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
tha
n
Nieder
t6010 (m
e
rge-base): m
o
d
ernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t7
6
00
(
mer
g
e):
t
est merge fro
m
branch
y
et to
be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t7600 (
m
erge
)
:
che
c
k re
f
log en
t
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): do not launch gitk for --debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
t
7
600 (merge)
:
moderni
z
e sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merge:
do not mistake (
a
ncesto
r
of)
tag for bra
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
un
i
o C Ha
m
ano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
te
s
ts
:
correct "does r
e
flog exist?" test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Bran
d
on Cas
e
y
t/:
work
a
round one-shot v
a
riab
l
e assignme
n
t with test_mus
t
_
fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
Nieder
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/
{
t55
4
1
,
lib-ht
t
pd}: replace pr
o
ble
m
a
t
ic '!()'
n
o
tation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
B
rand
o
n
C
as
e
y
t/t3700
:
co
n
vert two uses
of negation operator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Jun
i
o C
H
aman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Case
y
t/RE
A
DME: cl
a
rify test_must_
f
ail descripti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg B
r
ockman
Check size o
f
path buffe
r
bef
o
re wri
t
ing in
t
o
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
nio C Ha
m
ano
Me
r
ge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
upd
a
te-
s
erver-inf
o
:
Shorten r
e
ad_p
a
c
k_info_fil
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
var Arnfjörð
Bjarmason
g
i
t add:
A
dd --
i
gno
r
e-missing
t
o
SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar Arnfjörð Bjarmason
git submo
d
ule add: Rem
o
ve old docs
about im
p
licit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git su
b
m
o
d
u
le add: Require
t
he ne
w
--force
o
p
t
io
n
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C H
a
mano
Merge branch
'
jl/add-n
-
i
gno
r
e-miss
i
n
g
'
commit
|
commitdiff
|
tree
2010-07-19
D
avid Aguilar
Documentation: Explain git-merge
t
oo
l
's u
s
e of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
n
i
o C Hamano
Merg
e
br
a
nch
'jc/d
i
f
f-m
e
r
g
e
-
base-multi'
commit
|
commitdiff
|
tree
2010-07-16
T
h
omas Rast
Only run aggregate-results over ac
t
ual counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonatha
n
N
i
eder
A
d
d
a
sample
u
ser f
o
r
the svndump libr
a
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff A
.
.
.
B: do not limit the sy
n
t
ax t
o
o
narro
w
l
y
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
m
a
no
Merge branch 'jn/p
a
gina
t
e
-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o C Hamano
Merge branch 'wp/merge-t
r
ee-fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge branch
'js/merg
e
-rr
-
f
ix
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jc/diff
-
m
erge-base-
m
ulti'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge branch 'ns/me
r
ge
-
re
c
ursive-
u
p
t
odat
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
M
erge b
r
anch 'jn/
t
e
s
ts'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merg
e
branch 'eb/
d
oc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
m
ano
M
e
r
ge branch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
M
erge branch 'm
g
/revisio
n
-
d
oc'
commit
|
commitdiff
|
tree
2010-07-15
J
uni
o
C
H
am
a
no
Merge
branch '
j
k
/m
a
int-status-ke
e
p-i
n
dex-t
i
me
s
tamp
'
commit
|
commitdiff
|
tree
2010-07-15
J
uni
o
C
H
amano
Merge branch 'jc/reb
a
se-i-commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge
branch 'ab/submo
d
ule-add
-
f'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge
branch 'bc/m
a
i
n
t-mak
e
file-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Haman
o
M
erge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonatha
n
N
i
eder
Documentation: add
su
b
module
.
*
t
o
the
b
ig conf
i
gurat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
J
o
n
athan Nieder
gitmod
u
les
.
5:
u
rl can be a relati
v
e path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
P
a
v
a
n Kuma
r
Sunkar
a
gitw
e
b: fix esc_ur
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jo
n
athan Nieder
g
it
-
-paginate
:
pagi
n
ate
external
com
m
ands
a
g
a
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay
S
offian
ME
R
GE_RR is in
.
git, n
o
t
.
gi
t
/rr
-
cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palme
r
merge-tree: fix whe
r
e two bran
c
hes
s
ha
r
e no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add basi
c
tests
f
or m
e
rge-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Juni
o
C Hamano
Git 1
.
7
.
2-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Merge
b
ranch 'jc/read-tre
e
-c
a
che-tree-f
i
x'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Hari
n
ath
Use dev_t for device id (st_dev
)
fro
m
stat in se
t
up_git
_
di
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Ju
n
io C H
a
m
a
no
diff A
.
.
.
B
: give o
n
e pos
s
i
b
le diff when there
a
r
e
m
ore
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Juni
o
C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren He
l
d
git
fet
c
h
documentation: de
s
cribe
s
hort '
-
p' synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Va
j
n
a
format
-
patch: d
o
cument th
e
forma
t
.
to configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
J
ens Lehmann
git add: A
d
d
the "--ignore-missin
g
"
option for
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
i
chael J Gruber
test-lib: TAP
c
ompliance for skippin
g
te
s
ts on r
e
quest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mi
c
hael J Grube
r
test-lib: s
i
mplify GIT_SKIP_TESTS
loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
J
o
nath
a
n
Nie
d
er
t30
0
0 (ls-files -o): modernize s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredr
i
k
S
k
o
lmli
Do
c
umentation: Spe
l
l
i
ng
f
ix in protocol-c
a
pabilities
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nico
l
as Sebrecht
merge-recurs
i
v
e: use "up-to-date" inst
e
ad of "uptodate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrec
h
t
chec
k
o
u
t: a
c
cord
d
ocu
m
entation to what git does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Sixt
t
0005: w
o
rk around strange $
?
i
n
ksh wh
e
n
progra
m
termin
a
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
u
n
i
o C Hamano
M
e
rge remote branch 'ko/master' into jc/read-t
r
ee-
c
ache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo
Y
ang
dif
f
.
c: fix
a
graph out
p
ut bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð B
j
armason
tests: Us
e
skip_al
l
=* to skip
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ju
n
io C
H
amano
F
ix "
r
ead-tree -m A
B
" pr
i
ming th
e
c
ache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
i
Ba
r
zilay
Reorganize `git-log'
m
an page to
clarif
y
common di
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
g
r
ep -
O
:
D
o
not pass color sequence
s
as fi
l
enames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C
Hamano
Git 1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Hamano
Merge branc
h
'
ab
/
tap'
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C H
a
mano
b
a
ckmerge a few mor
e
fixes to 1
.
7
.
1
.
X
series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
Mer
g
e branch 'maint-1
.
6
.
4'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2010-07-07
U
w
e K
l
eine-Kön
i
g
rev
-
parse: fi
x
-
-
parse-opt --keep-dashda
s
h --st
o
p
-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C Hamano
Mer
g
e branch '
m
g/d
o
c-
r
ev-parse
-
treepat
h
-
s
y
ntax
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
erge bra
n
ch 'tr/receive-pack-aliased-update-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Hab
o
u
z
it
fix git branch -m in presence
o
f
cross devic
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon
C
asey
t/t00
0
6: specify timezone as
EST5 not EST to comply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next