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
t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
2010-09-09
Ramkuma
r
Ramachandra
t620
0
-
f
mt-
m
erge-m
s
g: Exer
c
ise '--log'
t
o
c
onfigure
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachan
d
r
a
t
6
200-fm
t
-merge-msg
:
Exercise 'merge
.
lo
g
' to configure
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ra
m
kumar
R
amachandr
a
me
r
ge: Make 'merge
.
lo
g
'
an integer or boolean option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ram
k
u
m
ar
Ramachandra
merge: Ma
k
e '
-
-log'
an int
e
ger o
p
tion fo
r
number of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
R
a
mkumar Ramachandra
fmt_merge_msg: Change fmt_me
r
ge_msg API to accept shortlog_len
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
mer
g
e scri
p
t:
l
earn --
[
no-]rerer
e
-auto
u
p
d
ate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an N
i
eder
merge script:
notice @{-1} short
h
an
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Nieder
merge script: handle --no-ff --no-commit c
o
rrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
ge script: --f
f
-on
l
y to di
s
allow true
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merg
e
script: ha
n
dle many
-
way octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
mer
g
e s
c
r
ip
t
:
handle
-
m --log
c
orrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nie
d
er
merge script: f
o
r
bid merge -s ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Ni
e
der
merge script: allow
c
ustom
s
trategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge
s
cr
i
pt: merge -X<opti
o
n
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
th
a
n
N
ieder
merg
e
s
c
ript: improve log me
s
sage su
b
ject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cript: refuse to merge during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
N
ie
d
e
r
merg
e
script: tweak unmerged files message to mat
c
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
m
erge scrip
t
: --sq
u
a
sh, --ff from
unborn branch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
f
m
t-merge-msg -m to override merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge
-
base --independent to print reduced parent l
i
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onatha
n
Nieder
merge-b
a
se --octop
u
s to mimic show-branch --me
r
ge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
D
o
cument
a
tion: add a
S
E
E ALSO
s
e
ction for merge-b
a
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t6200 (fmt-merge-msg): style nitp
i
cks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
ona
t
han
N
ie
d
er
t60
1
0 (merg
e
-
b
ase): modernize st
y
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600
(merge): test merg
e
fro
m
branch ye
t
to be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600
(merge):
check reflog e
n
try
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t76
0
0
(merge): do not lau
n
c
h gitk for -
-
debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
han Nieder
t7600 (merge)
:
m
oder
n
ize s
t
y
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
Nieder
merg
e
:
d
o
not mistake (ancestor of) tag for b
r
anch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
unio C Hamano
Git
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
uni
o
C Hama
n
o
tests
:
c
o
rrec
t
"
does reflo
g
ex
i
st?" te
s
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon
C
a
s
e
y
t
/: work
around one-shot variable as
s
ignment with te
s
t_must_
f
ail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/RE
A
D
ME: correct an e
x
ception when b
r
e
a
k
i
n
g a && chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Bran
d
on Casey
t
/{t5541,lib-httpd}:
replace problematic '!()' nota
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
don C
a
sey
t
/
t37
0
0:
c
onvert two uses of negat
i
on ope
r
a
t
o
r
'!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Me
r
ge br
a
n
c
h
'
main
t
'
commit
|
commitdiff
|
tree
2010-07-20
Brandon
Casey
t/R
E
A
D
ME: clarify test_
m
ust
_
fail des
c
r
i
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
Brockma
n
Check
s
ize of pa
t
h buf
f
er befo
r
e
writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
uni
o
C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
u
pdate-serv
e
r-info: Shorten read
_
p
ack_info_
f
ile()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bja
r
mason
git add: Add --
i
g
nore-missin
g
to SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð
B
jarmas
o
n
git submodule
a
d
d
: Remove
old docs about im
p
li
c
it -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens
Leh
m
a
n
n
g
i
t submodule add
:
Require th
e
new --force option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Me
r
ge branch 'jl/add-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documen
t
ation: Expl
a
in git-mergeto
o
l's u
s
e of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C Hamano
Mer
g
e
b
r
anch
'jc/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas
Ras
t
Onl
y
run aggregate-re
s
ult
s
over
actua
l
c
ounts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
o
nath
a
n
Nieder
Add a sample user for the svndu
m
p
library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Ju
n
io C Ha
m
an
o
diff A
.
.
.
B: do
not limit
the
s
yntax too narrow
l
y
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Merge
branch 'jn/paginate-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C H
a
mano
Merge branch 'wp/merge-
t
r
ee-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o C Hamano
Merge
branch 'js/m
e
rge-r
r
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge
b
r
anch 'jc/d
i
ff-
m
erge-base-mul
t
i
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hama
n
o
Merge br
a
nch '
n
s/m
e
rge-rec
u
r
sive-u
p
todate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ranch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge br
a
n
ch 'eb/doc-log-m
a
npage'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge bra
n
ch '
j
n/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
J
u
ni
o
C Hamano
Merge branch 'mg/revision-
d
oc'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
H
amano
Merg
e
b
r
anch 'jk/mai
n
t-
s
tatus-k
e
ep-in
d
e
x-tim
e
stamp'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C H
a
mano
M
erg
e
br
a
nch 'jc
/
rebase-i-c
o
m
m
it
-
msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge br
a
n
ch 'ab
/
submodule-ad
d
-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merg
e
b
ranch
'
bc/maint-mak
e
f
i
le
-
fixe
s
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Haman
o
Merge branc
h
'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-07-15
Jonat
h
an Nie
d
er
Documentation
:
add submodule
.
* to the big c
o
nfigurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
than Ni
e
d
er
g
it
m
odules
.
5
:
u
rl can be a relative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan
K
umar Sunkara
gitweb: fix esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonath
a
n Nieder
git --paginate:
paginate external com
m
ands again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE_RR is i
n
.
g
i
t, n
o
t
.
g
i
t
/
rr-cach
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will P
a
lmer
mer
g
e
-
t
r
ee:
f
ix whe
r
e two bra
n
ches
share no changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
W
i
ll Palmer
add basi
c
tests for merge-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
u
nio
C
Ha
m
ano
G
it
1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
unio
C
H
a
mano
Merge
branch 'j
c
/r
e
ad
-
tre
e
-cache
-
tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raj
a
R Harinath
Use dev_t f
o
r devi
c
e id
(
st_
d
ev) fro
m
st
a
t in set
u
p_g
i
t
_
dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
J
unio C H
a
man
o
diff A
.
.
.
B
: give one possibl
e
diff when there are more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
H
a
m
ano
M
erge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
g
i
t fet
c
h
do
c
ume
n
t
at
i
on: describe short
'
-p' synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vajna
form
a
t-p
a
tch: document the format
.
to configurati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens
Lehmann
git add:
Add the "--i
g
nore-missing" optio
n
for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
i
c
hae
l
J G
r
uber
test-lib: TAP compliance for skipping tests o
n
r
equest
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J
G
r
uber
test
-
lib:
s
impl
i
fy
G
IT_SKIP
_
TESTS l
o
op
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Juni
o
C
H
a
mano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
J
o
nathan Nieder
t3000 (ls-files -o): modern
i
ze style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fred
r
ik Skol
m
li
Documentation: Spelling fix i
n
protocol-c
a
pab
i
li
t
ies
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
S
e
b
r
e
cht
me
r
ge-r
e
cursive: use "up-
t
o-
d
ate" instead o
f
"uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
S
e
brecht
checkout:
acc
o
r
d
documentation t
o
what g
i
t does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Joh
a
nnes Sixt
t
000
5
:
work
a
r
o
und
strange $? in ks
h
when program t
e
r
m
i
n
a
t
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Merge re
m
ote branch 'ko/master'
i
n
to jc/read-t
r
ee-c
a
c
he
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Ya
n
g
diff
.
c: fi
x
a graph output bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjö
r
ð Bjarmas
o
n
tests
:
Use skip_all=* to sk
i
p tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Fix "read-tree -m A B" priming the cache-tre
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
l
i Barzil
a
y
Reorganize `git
-
log' man page to clarify common d
i
f
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramli
y
grep -O: Do not
p
ass color sequ
e
nc
e
s as filena
m
es to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
Git 1
.
7
.
2-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merg
e
branch 'ab/
t
ap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
J
unio
C
Ham
a
n
o
ba
c
kmerge a fe
w
more fixes to 1
.
7
.
1
.
X seri
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Ham
a
no
Merge branch 'maint-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Klein
e
-
König
rev-parse
:
fix --parse-opt --keep-da
s
h
dash
-
-
stop-
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branc
h
'mg/d
o
c-rev-pa
r
s
e-treepath-syntax' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C Hamano
Merge
b
ranch 'tr/receive-p
a
ck
-
a
l
iased-upd
a
te-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
next