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 script: merge -X<option>
2010-08-18
Jonathan Niede
r
merge scr
i
p
t
:
merg
e
-X<option
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
merge script: improve log m
e
ssa
g
e s
u
b
ject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nied
e
r
mer
g
e script: refuse
t
o
mer
g
e
during merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
merge script: tweak unme
r
g
ed f
i
l
e
s message to
mat
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han N
i
eder
m
erge
s
cript: --squash, --ff f
r
o
m
unborn branch a
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
fmt-merge-msg -
m
to over
r
ide
merge
t
itle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nie
d
er
merge-bas
e
--
i
ndep
e
nd
e
n
t
to print reduced
p
a
r
ent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
m
e
rge-base --o
c
topus
to mimic show
-
bran
c
h --merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
Documentation: add a SEE
ALSO section for merge-ba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onath
a
n Nieder
t6200 (fmt-merge
-
msg):
s
tyle nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010 (
m
e
r
ge-base): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t7600 (merge): test merge from branch y
e
t to be bo
r
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
ieder
t7600 (merge): check reflog ent
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
t7600 (mer
g
e): d
o
not launch
g
itk for -
-
debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
t7600 (me
r
ge): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
m
e
rge: do no
t
mistak
e
(ancestor of) tag
f
or
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C
Hamano
Git
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C
Hamano
tests: correct "does refl
o
g e
x
i
s
t?" t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/: work around one-shot variabl
e
assignme
n
t with test
_
m
u
s
t_fai
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonath
a
n Nieder
t/README: correct an exception when breaking
a && cha
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
asey
t/{t5541,lib-
h
t
t
pd}: r
e
place problemat
i
c '!()' notation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
B
randon Casey
t/t3700: c
o
nvert
two use
s
o
f
n
egation op
e
rator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Ju
n
io C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t
/
R
EADME: clarify test_mus
t
_fail d
e
scri
p
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg Bro
c
kman
Check size of path buffer before
w
riting into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jun
i
o
C H
a
mano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Th
i
elow
update-server-in
f
o: Shorten read_
p
ac
k
_info_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Ar
n
fjörð
Bjarmas
o
n
git add: Add -
-
ignore-m
i
s
s
ing to
S
YNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arn
f
j
örð Bjarmason
git su
b
module add
:
Remove old docs ab
o
ut implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git s
u
bmodu
l
e add: Require the
new --force option
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
n
i
o
C
Hamano
Merge b
r
anch 'jl/add
-
n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
D
a
v
i
d Aguilar
Documentation: Explain
g
it-mergetool's
use of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Merge branc
h
'j
c
/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Th
o
mas Rast
Only
run aggregate-results
ove
r
actu
a
l cou
n
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
ona
t
han Nieder
Add a
sample us
e
r f
o
r
t
he svndump libr
a
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
Hama
n
o
diff A
.
.
.
B
:
do n
o
t limit
th
e
syn
t
ax too
n
arrow
l
y
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Mer
g
e bran
c
h 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch
'wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hama
n
o
Merge
bran
c
h 'jc/di
f
f-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C Hamano
Merge branc
h
'
n
s/merge
-
re
c
u
rsive-
u
ptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge
b
r
anch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
r
g
e b
r
anch 'e
b
/doc-log
-
manpage'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C H
a
m
ano
Merge br
a
nc
h
'jn/g
r
ep-op
e
n'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
amano
Merge branch
'mg/r
e
v
ision-doc
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge branch
'
j
k/maint-status-keep-index-tim
e
stam
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
a
n
c
h 'jc/rebase-i-commit-ms
g
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Merge br
a
n
ch 'ab/submodule-add-f
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge branch
'bc/maint
-
make
f
il
e
-f
i
xes'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
J
onathan Nieder
Docu
m
en
t
at
i
on: add submodu
l
e
.
* to the big configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
g
i
tmodul
e
s
.
5: ur
l
c
an be a rela
t
ive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan K
u
m
a
r
Sunkara
gitweb: fix esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jon
a
than
Nied
e
r
gi
t
--paginate: p
a
ginate
external
c
o
m
mand
s
a
gain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE
_
RR is
in
.
g
it, not
.
git/rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will P
a
lme
r
merge-
t
ree:
f
i
x where two branches
sha
r
e no change
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add basic tes
t
s for me
r
g
e
-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Ham
a
n
o
Gi
t
1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Me
r
ge br
a
nc
h
'jc/read-tree-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja
R Harin
a
th
Use dev_t f
o
r d
e
vice id (st_dev
)
from s
t
a
t in se
t
up_git_d
i
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
d
i
ff A
.
.
.
B: give one poss
i
ble
d
iff
when there
a
re
m
ore
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Juni
o
C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren He
l
d
git fetch
d
ocument
a
tion: des
c
r
i
b
e
shor
t
'-p'
synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklo
s
Vajna
format
-
patch
:
document the format
.
to con
f
ig
u
r
a
t
io
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
g
it add: A
d
d th
e
"--ignore-missing" o
p
tion for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
tes
t
-lib: TAP co
m
pliance for skipp
i
ng
t
ests on re
q
uest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
test
-
lib:
simplify GIT_SKI
P
_TESTS l
o
op
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C H
a
mano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
J
o
n
atha
n
Ni
e
d
er
t3000 (ls-
f
iles
-
o): moderni
z
e st
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
Docume
n
tat
i
o
n
:
Spe
l
ling
f
ix
i
n protocol-capabilitie
s
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
m
erge-recursive: us
e
"up-to
-
date" instead of
"
u
ptodate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
N
i
colas Sebrech
t
chec
k
out:
a
cco
r
d
d
o
cumentation to wha
t
g
it d
o
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
o
hanne
s
Sixt
t0005:
w
ork around st
r
ange $? in k
s
h when program ter
m
inated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio
C Hamano
M
e
rg
e
remote branch '
k
o/ma
s
ter' i
n
to jc/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Y
a
n
g
di
f
f
.
c: fix a graph out
p
u
t
b
u
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Ar
n
fjö
r
ð Bjarmason
tests: Use skip_all=*
t
o skip tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hama
n
o
Fix "read-tree
-
m A B
"
priming the cac
h
e-t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barz
i
lay
Reorganize `git-log' ma
n
page
t
o cl
a
rify
c
ommon dif
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazr
i
Raml
i
y
grep -O: Do
not p
a
ss color sequences a
s
f
ile
n
ames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Git 1
.
7
.
2
-
rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Me
r
ge bran
c
h 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hama
n
o
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Hama
n
o
back
m
erge a few more fixes to 1
.
7
.
1
.
X
s
eries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge br
a
n
c
h 'maint-1
.
6
.
4' into m
a
int
commit
|
commitdiff
|
tree
2010-07-07
Uw
e
Klei
n
e-König
r
e
v-
p
arse: fix
-
-
p
ars
e
-opt --keep-d
a
shdash --sto
p
-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Ha
m
ano
Merge
b
r
a
nc
h
'mg/do
c
-rev-parse-tree
p
ath-syntax'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Haman
o
Merge branch 'tr/rec
e
ive-
p
ac
k
-aliase
d
-upda
t
e-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pie
r
re Hab
o
uzit
f
ix
git branch -m in presence of cro
s
s
d
evices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Bran
d
on Casey
t/t0006: spe
c
ify timez
o
ne as EST5 n
o
t EST to co
m
ply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C Hamano
do not write out ind
e
x when status does
not hav
e
to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C H
a
mano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Voigt
add mis
s
ing && to
sub
m
odule-me
r
ge t
e
stcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
ath
a
n Nieder
t
/README: do
c
u
men
t
more test
h
e
l
pers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Casey
Makefi
l
e
: work around
ksh's failur
e
to handle missin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
J
eff King
test-date:
fix
s
s
canf type c
o
nversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-06
Dylan
Reid
xdif
f
: optimise f
o
r no whi
t
espace
d
i
f
ference when igno
r
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jun
i
o C
H
a
mano
rebase-i:
do not get
f
ooled by a log m
e
ssa
g
e
ending
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio
C Hama
n
o
rebase
-
i: style
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michael J G
r
uber
D
o
cumentati
o
n: link to
g
itrevision
s
rather
t
h
an
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next