repo.or.cz
/
git
/
gitweb.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 R
a
mac
h
andra
me
r
ge: Make 'mer
g
e
.
log' a
n
int
e
ger or boolean option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachandra
merge: Make '--log'
an integer option for number of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramku
m
ar Ramachandra
fmt_merge_msg: Change fmt_
m
erge_msg
AP
I
to accep
t
shortlog_le
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: l
e
a
rn --[no-]rerer
e
-autoupdate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an Ni
e
der
merg
e
s
c
ript: n
o
tice @{-1
}
shorthand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
ieder
merge s
c
ript: handle
--no-ff --no-commi
t
cor
r
e
ctl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
ath
a
n
Niede
r
mer
g
e
script: --
f
f-only
t
o di
s
allow true merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merg
e
sc
r
i
p
t:
handl
e
man
y
-way
o
ctopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge script: handle -m --log correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge script: fo
r
bid mer
g
e -
s
ind
e
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
e
d
er
merg
e
script: allow cust
o
m strategie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
mer
g
e script: merge -X
<
o
p
tion>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merge s
c
ript: improve
l
og message subject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
N
ieder
m
e
rge script:
ref
u
se to mer
g
e
d
ur
i
n
g
m
er
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Nieder
merge scr
i
pt
:
t
w
e
ak unm
e
r
g
ed files message to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
mer
g
e scrip
t
: --squash, --ff from unborn
b
r
anch are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
fmt-m
e
rge-msg -m to o
v
erride merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-base -
-
independent t
o
print r
e
duced p
a
re
n
t list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge-base --o
c
topu
s
to
m
imic
sho
w
-
branch --
m
erge
-
base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
Do
c
ume
n
tation: add
a SEE ALSO section for me
r
g
e
-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t620
0
(fmt-merge-msg): styl
e
nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
Nied
e
r
t601
0
(merge-base):
m
o
der
n
iz
e
s
ty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nie
d
e
r
t
7600 (merge): test merge
from
b
ranch yet to
b
e born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): che
c
k reflog
e
n
t
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
Nieder
t
76
0
0 (merge):
do not launch gitk
fo
r
--debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
e
der
t760
0
(
m
erge):
m
o
dernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
than Niede
r
merg
e
: do n
o
t
mistake (ancest
o
r of
)
tag for branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ha
m
ano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Juni
o
C Hamano
tests:
correct "does reflog exist?" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Ca
s
ey
t/: work around on
e
-shot va
r
i
a
ble assignment wit
h
te
s
t_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
onat
h
an Nieder
t/README: corre
c
t an excepti
o
n when breaking a &
&
c
h
ai
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t
/{t5541,lib
-
http
d
}:
r
epl
a
ce
p
ro
b
lematic
'
!()
'
notation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t3700
:
convert tw
o
uses of negati
o
n operator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio
C
H
am
a
no
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-20
Brando
n
Cas
e
y
t/READ
M
E: clar
i
fy
t
est_
m
ust_fa
i
l description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg
B
ro
c
kman
C
h
eck size of path buffer before
w
riting into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
M
erg
e
bran
c
h 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-07-19
R
alf Thielow
update-server
-
inf
o
: S
h
orten read_
p
ack
_
i
n
fo_
f
i
l
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfj
ö
rð Bj
a
rma
s
on
g
i
t
add: A
d
d -
-
ignore-missing to SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar
A
rnfjörð
Bjarmaso
n
git submodule a
d
d: Remove old docs about impli
c
it -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git submodule add: Require the new --forc
e
opti
o
n to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Ham
a
no
M
erge
b
ranch 'jl/add-n-ign
o
r
e-missing'
commit
|
commitdiff
|
tree
2010-07-19
Dav
i
d
Aguilar
Docume
n
tation
:
Explain g
i
t
-me
r
g
etool'
s
u
se of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
Hamano
Me
r
ge bran
c
h
'
jc/dif
f
-merge
-
base-
m
ulti'
commit
|
commitdiff
|
tree
2010-07-16
T
h
omas Rast
Onl
y
r
u
n aggregate-re
s
ul
t
s ove
r
ac
t
ual counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
onatha
n
N
i
e
d
er
Add a s
a
mple
user
f
or t
h
e svndump library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff A
.
.
.
B: do not
l
imit the syntax too
n
a
rrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge br
a
nch 'jn/pa
g
inate-fix
'
commit
|
commitdiff
|
tree
2010-07-15
J
un
i
o
C Hamano
Merge branch 'wp/merge-
t
re
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
M
e
rge bran
c
h 'js/merge-
r
r-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge branch 'jc/diff-
m
e
r
ge-b
a
s
e-m
u
lti'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch
'ns/me
r
ge-recursive-upto
d
ate'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merg
e
branch
'
jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'eb/doc-
l
og-manp
a
g
e
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C
H
am
a
no
Merge
b
ranch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Me
r
ge branch
'
mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge
b
r
a
n
c
h
'jk/maint-stat
u
s-keep-index-tim
e
stamp'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o C Hama
n
o
M
e
rge branch 'jc/rebase-i-commit-
m
sg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
mano
M
e
rge branch 'ab/s
u
bmodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Ha
m
a
no
Me
r
ge branch 'bc
/
m
a
int-
m
akefile
-
fix
e
s'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2010-07-15
Jonat
h
an
N
ieder
Documenta
t
ion: add submo
d
ule
.
* to the big co
n
figuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nathan N
i
e
d
er
gitmodules
.
5: url can be a relat
i
ve path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Sunk
a
ra
gi
t
web: fix esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
git --paginate:
paginate
e
xternal commands
agai
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Sof
f
ian
M
ERGE_RR i
s
in
.
git, not
.
g
i
t
/r
r
-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
merge-tre
e
: fix
w
her
e
two branches
s
hare no
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
ad
d
basic tes
t
s for
m
erg
e
-tree
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 Hamano
Me
r
ge branch
'
jc
/
read-tree-cache-tree-f
i
x'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Ha
r
ina
t
h
Use dev_
t
for device id (st_dev) fr
o
m st
a
t in setup_git_d
i
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
J
unio C
H
amano
d
iff
A
.
.
.
B
:
g
ive on
e
pos
s
ibl
e
diff
w
hen ther
e
are
more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio
C
Ha
m
ano
M
e
rge branc
h
'
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-07-13
Or
e
n Held
git
fetch do
c
umentation: de
s
c
r
ib
e
short '-p' synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklo
s
Vajna
format-patch: document the f
o
rmat
.
t
o co
n
figuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens Le
h
mann
git add:
A
dd the
"--igno
r
e-m
i
ssi
n
g" opti
o
n for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mic
h
ael J Gruber
t
est-lib: TAP complia
n
c
e
for skipping
t
e
sts on req
u
e
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
test-li
b
: sim
p
li
f
y G
I
T_SKIP_TESTS
loo
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jun
i
o
C
Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jo
n
athan N
i
eder
t
300
0
(
l
s-f
i
les
-o
)
: mod
e
rnize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
Documen
t
ation: Spelling f
i
x
in
protocol-capabili
t
ies
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicola
s
Seb
r
echt
merg
e
-recursiv
e
: us
e
"up-to-date" ins
t
e
a
d of "uptodate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrech
t
checkout:
a
ccord
documentation to
w
h
at git
does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
o
hannes Sixt
t0005: work
around
s
tra
n
g
e
$? in k
s
h when program terminated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C
Hamano
Me
r
ge remote bra
n
ch 'ko/m
a
ster' into jc/read-t
r
ee-cac
h
e
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c: fix a
grap
h
o
u
tput bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar
A
rnfjörð B
j
arma
s
on
t
ests: U
s
e skip_
a
ll=* to ski
p
test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C
Hamano
F
ix "re
a
d
-tree -m
A B
"
pri
m
in
g
t
he
c
ache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
Barzilay
Reorgan
i
ze `git-l
o
g' man
p
age to
c
la
r
ify common
d
iff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramli
y
grep -O: Do not pa
s
s color sequen
c
e
s
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-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hamano
Merge b
r
anch 'a
b
/tap'
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
io C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
backme
r
ge
a
fe
w
more
fixes to 1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
ma
n
o
Merge branch 'maint-1
.
6
.
4' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kle
i
ne-König
rev-p
a
r
s
e: fix
-
-
parse-o
p
t --k
e
ep-dash
d
a
s
h
--s
t
op-
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
Merg
e
branch 'mg/doc-rev-parse-treepath-
s
yn
t
ax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
J
unio C
Hamano
Merge branch 't
r
/receive-
p
ack-aliased-u
p
date-fix'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
ierr
e
H
a
bo
u
zit
f
ix git
b
ranch -m in presence of cross
d
evices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
B
r
and
o
n
Casey
t/t00
0
6: specify tim
e
zone a
s
ES
T
5
n
ot EST
to comply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next