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: handle -m --log correctly
2010-08-18
Jonathan
Nieder
merge script: hand
l
e
-m
--
l
og corr
e
ctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
t
ha
n
Nieder
m
e
rge sc
r
ip
t
:
forb
i
d me
r
ge -s index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
mer
g
e script:
a
llow
c
us
t
o
m stra
t
egies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge
s
cript: merge -X<optio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
ieder
merge script: improve log mess
a
ge
s
ubject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge script: refuse to merg
e
during merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
ieder
merge script: tweak unmerged files
me
s
sage to matc
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge script: --squ
a
sh, --ff
f
rom unborn
b
ranc
h
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Ni
e
der
fmt-
m
erge-ms
g
-m to override merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge
-
b
a
se --i
n
dependent to print reduced parent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Niede
r
merge-base --o
c
t
o
p
us to mimi
c
show-branch --merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
Documen
t
ati
o
n: add a SEE ALSO sect
i
o
n
f
or merg
e
-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t6
2
00 (fmt-
m
er
g
e-
m
sg):
style nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
t6010 (merge-base): modernize styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
i
ed
e
r
t7600 (merge): test merge from b
r
anch y
e
t to be
bo
r
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (me
r
ge): chec
k
reflog entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t7600 (merge): do not
l
aunch gitk for --debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
N
i
eder
t7600 (merge): moderniz
e
st
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merge: do not mistake (ance
s
tor of
)
t
ag for branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
Gi
t
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
u
nio C Hama
n
o
tests: correct "do
e
s reflog exist
?
" 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
ariab
l
e as
s
i
g
nment with test_mu
s
t_f
a
il
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/README: co
r
r
e
ct an exception w
h
en bre
a
king a &
&
chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
Casey
t/{t5541,l
i
b-httpd}: rep
l
a
ce problematic '!(
)
' nota
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
don Casey
t/t3700: convert two
uses of
neg
a
tion operator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Haman
o
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-20
Bran
d
on
C
asey
t/READM
E
: clarif
y
test_must_fail description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
Brockman
Check size of pa
t
h
buffer before w
r
iting
int
o
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
nio C Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
R
a
lf T
h
ielow
update-ser
v
e
r
-info: Sho
r
ten read_pac
k
_i
n
fo_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar A
r
nfjörð Bjarmas
o
n
git
add:
A
dd --ignore-missing
t
o S
Y
NOPS
I
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar A
r
nfjör
ð
Bjarmason
git su
b
m
o
d
ule add:
Rem
o
ve
o
ld docs
a
bout implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Le
h
mann
git submodule a
d
d: Require the n
e
w --fo
r
c
e option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio
C
Hamano
Merge branch 'jl
/
add-n-i
g
nore-mis
s
ing'
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
Documentation: Explain gi
t
-mer
g
e
t
o
ol's us
e
of tempor
a
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
n
io C Hamano
Merge bran
c
h 'jc/diff-merge-b
a
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Only
r
un
a
g
gregate-
r
esults
o
ver
actual co
u
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han
N
iede
r
A
d
d a sample u
s
er for
t
he
s
vndum
p
library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hama
n
o
di
f
f A
.
.
.
B: do not limit
t
h
e syntax too narrowl
y
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Ha
m
ano
Merge branch 'jn/pagi
n
a
t
e-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
M
e
rge branch '
w
p/merg
e
-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o C
H
amano
M
erge bran
c
h 'js/merge-
r
r-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
m
a
no
Mer
g
e br
a
n
c
h 'jc/diff-merge-base-
m
ul
t
i'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'ns
/
merge-recursive
-
uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merg
e
b
r
anch
'
j
n/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bran
c
h 'eb/doc-l
o
g-
m
anpage'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C H
a
man
o
Merge branch 'jn/grep-op
e
n'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
c
h
'
mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merg
e
branc
h
'jk/maint-stat
u
s
-
keep-in
d
ex-tim
e
stamp'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge branch 'jc/reba
s
e-i-commit
-
msg-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'ab/
s
ubmodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge branc
h
'bc/maint-mak
e
file-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C Hamano
Me
r
ge br
a
n
ch
'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan Nieder
D
o
c
u
men
t
ation: add sub
m
odule
.
* to the big configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan Nieder
gitm
o
d
u
le
s
.
5
: url can
be
a
relative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kum
a
r
Sun
k
ara
gitweb: fix
esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
git --pagin
a
te: p
a
ginate exte
r
nal
commands again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE_RR is in
.
g
i
t, not
.
git/rr-
c
ache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
me
r
ge-t
r
ee: f
i
x where two b
r
anche
s
s
h
a
r
e no
c
ha
n
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add ba
s
ic tests for
m
e
rge-t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C H
a
m
ano
Git
1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C H
a
mano
Merge
b
ra
n
c
h
'jc/rea
d
-tree-cache-tree-
f
ix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Hari
n
ath
Use
d
ev_t
f
or device id
(st_dev) from stat in setup_git_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff A
.
.
.
B: giv
e
o
ne possible d
i
ff when there are more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Ju
n
io
C
H
amano
M
e
rge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
g
i
t
f
etch documen
t
ation: describe sho
r
t '-p' syno
n
y
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklo
s
Va
j
na
format-pat
c
h: do
c
um
e
nt the format
.
to conf
i
gu
r
a
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Je
n
s L
e
h
mann
git
a
dd: Add the "--ignore-missing"
optio
n
for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
ichael J
G
r
uber
tes
t
-lib
:
TA
P
compl
i
ance fo
r
skippi
n
g
t
e
sts on r
e
quest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J
Gruber
test-l
i
b: si
m
plify
GIT_SKIP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Ju
n
io C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jo
n
at
h
an Nieder
t
3
000 (ls-
f
iles -o): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fr
e
drik Skolmli
D
ocumentat
i
on: Spelling fix
i
n protocol-capabil
i
ties
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
Sebrecht
m
e
r
ge-recursive: use
"up-t
o
-date" ins
t
ea
d
of
"
up
t
odate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicol
a
s Sebre
c
ht
checkout: acc
o
rd
do
c
umentatio
n
t
o
what
g
it does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Six
t
t0005: wo
r
k
aro
u
nd str
a
n
g
e
$? in ksh when program
t
erminat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
M
e
rge remot
e
branch 'ko/master
'
i
nto jc/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c: fix a graph outpu
t
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Æva
r
Arn
f
jörð Bjarmason
t
ests:
U
se skip_all=* to skip tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
u
nio C Ham
a
no
Fix "read-tr
e
e -m A B
"
priming
t
h
e
cache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
Reorganize `git-log' man page t
o
clarif
y
common diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Naz
r
i
R
amliy
grep -O:
D
o
not pass col
o
r
s
equences as filenames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Ham
a
no
Git 1
.
7
.
2-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
io C Haman
o
Merge br
a
n
ch
'
a
b/tap
'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ham
a
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
H
amano
bac
k
merge a few more
f
ixe
s
to 1
.
7
.
1
.
X s
e
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'm
a
int-1
.
6
.
4' into
m
aint
commit
|
commitdiff
|
tree
2010-07-07
Uw
e
Klei
n
e-König
rev-
p
arse: fix --parse-opt --keep-d
a
shdash
--s
t
op-
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
M
erge bra
n
ch 'mg/doc-rev-par
s
e-treepath-syntax' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hamano
Merge
branch 'tr/receive-pac
k
-
a
liased-
u
p
d
ate-fi
x
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre H
a
bouzit
f
i
x git branch -m in presence of cro
s
s devices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Cas
e
y
t
/
t0006:
specif
y
time
z
o
ne as EST
5
not EST to co
m
ply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o
C
Haman
o
d
o
not wri
t
e
ou
t
index when status does not hav
e
to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Voigt
add missing && to s
u
bmodule
-
merge testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
athan Nieder
t/README: docu
m
ent mo
r
e test he
l
pers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Br
a
ndon Casey
Makefile: work
ar
o
und ksh's
fai
l
ure to h
a
n
d
le m
i
ssing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-date: fix s
s
ca
n
f type conve
r
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio
C H
a
mano
Merge
branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-07-06
Dyla
n
R
e
i
d
xdiff: optimise for
no whi
t
espace diffe
r
ence when i
g
nor
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next