repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: tweak unmerged files message to match builtin
2010-08-18
J
o
nat
h
an Niede
r
merge script: tweak u
n
merged fil
e
s message t
o
match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Niede
r
m
e
rge scrip
t
: --sq
u
ash,
-
-ff from unborn
b
r
a
n
ch are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt
-
merge-m
s
g -m to overr
i
de merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge-base --i
n
dependent to p
r
int reduced parent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
me
r
ge-base --
o
ctopus to
mi
m
ic show-br
a
n
ch --merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
D
o
cumentation
:
add a SEE ALSO se
c
t
i
o
n
for
m
erge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
t6200 (fmt-merge
-
m
sg): style nitpi
c
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010 (merge-base): modernize
s
t
yl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
t7600 (merg
e
): test merg
e
fr
o
m branch yet to
be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t7600 (me
r
ge): check
reflog entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge):
d
o not launc
h
gitk for --debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
t7
6
00 (merge): mod
e
rnize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nied
e
r
m
erge: do no
t
mistake (ancestor
of) tag for branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C H
a
m
a
n
o
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ham
a
n
o
te
s
t
s
: correct "does reflog
e
x
ist?" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/: work a
r
o
u
n
d
on
e
-sho
t
varia
b
le ass
i
gnment with test
_
must
_
fai
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
onatha
n
Nieder
t/README: correct
a
n
excepti
o
n
w
hen breaki
n
g
a
&& chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
a
s
ey
t/
{
t
5
541,lib-httpd}: rep
l
a
c
e problem
a
t
ic '!()' notat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
ndon Casey
t
/
t
3
700: conver
t
two us
e
s of negation ope
r
ator '!
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-07-20
B
randon Casey
t/README: clarify test
_
must_fail
d
e
s
cription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg
B
rockma
n
Check
s
ize of path buffer before
writing
i
nto it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C H
a
mano
M
e
rge br
a
nch '
m
a
in
t
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thiel
o
w
upd
a
te-serve
r
-
info: Shorte
n
read_pack_info_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar Arnfjörð Bjarma
s
o
n
git add:
A
d
d --ignore-missing to SY
N
OPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
A
rnfjörð B
j
ar
m
ason
git s
u
b
module add: Remo
v
e old docs about implicit
-f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Le
h
ma
n
n
git sub
m
odule add:
R
eq
u
i
r
e
t
he new
-
-
force optio
n
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
Haman
o
Mer
g
e br
a
nch 'jl/add
-
n
-
i
gn
o
re-mi
s
sing'
commit
|
commitdiff
|
tree
2010-07-19
D
av
i
d Aguilar
Document
a
tion:
Exp
l
ain
g
i
t-mergetool's use
of tempora
r
y
.
.
.
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
-
m
u
lti'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Onl
y
run aggre
g
ate-results ove
r
act
u
al count
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Add a sam
p
le user for the svndump
l
i
b
r
a
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
Hamano
d
i
ff A
.
.
.
B: do
n
o
t
l
i
mit the syntax
too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge
b
ranch 'j
n
/pagina
t
e-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merg
e
branch
'wp/merge-t
r
ee-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Mer
g
e branch 'js/m
e
rge-rr-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Me
r
ge branch 'jc/diff-me
r
ge
-
base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge
branch
'ns/merge-recursive
-
uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
aman
o
Merge branch
'
jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Ham
a
no
M
e
r
ge b
r
a
nc
h
'eb/
d
oc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
m
ano
M
erge branch
'
j
n/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Haman
o
Merge branch
'mg/revi
s
ion-
d
oc'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge branch
'
jk/ma
i
nt-status-keep-inde
x
-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge br
a
n
ch 'jc/reba
s
e-i-c
o
m
mit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge br
a
nch 'ab/submodule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge branch 'bc
/
maint-makefile-f
i
xes
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
Hamano
Merge bra
n
ch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2010-07-15
J
onatha
n
Niede
r
Documen
t
ation: add submodule
.
* to th
e
big configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
J
onatha
n
N
ieder
g
itmod
u
les
.
5
:
url can be a relative p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan
Kuma
r
Su
n
ka
r
a
gitweb: fix
e
sc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jona
t
han Nie
d
er
git --
p
aginate: pa
g
inate external co
m
mands again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
a
y Soffian
MERGE_RR is in
.
gi
t
, no
t
.
git/rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will P
a
lme
r
merge-tree
:
fix where two branch
e
s s
h
are no
c
hange
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Wil
l
Palmer
add b
a
sic tests for merge-
t
ree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
u
nio C Ha
m
ano
G
i
t
1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
u
nio C
H
a
m
ano
M
erge branch
'jc/read-tree
-
c
a
c
h
e-t
r
e
e
-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harinath
Use de
v
_t for device
id (st_dev) fro
m
stat
in setu
p
_g
i
t_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff A
.
.
.
B: give one
p
ossible
dif
f
when
there are mo
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
M
erge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-13
Oren
H
el
d
git f
e
tch doc
u
m
e
ntatio
n
: de
s
cribe short '-p' synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklos
Vajna
format-patch:
d
ocu
m
e
n
t
t
he form
a
t
.
to configura
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
J
e
ns Lehmann
git add: Add
th
e
"--ignore-mi
s
sing"
option
for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mi
c
hael J Gruber
test-lib: TAP compl
i
ance for sk
i
pping
tests on request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Micha
e
l
J
G
ruber
test-lib: simplif
y
GIT_SKIP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
J
o
nath
a
n Niede
r
t300
0
(ls
-
files
-o): modernize styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
Documen
t
ation
:
Spelling
fix in protocol-
c
apabilities
.
t
xt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
m
e
rge-recursive:
us
e
"up-to-date" instead
o
f "uptoda
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
c
h
eck
o
ut:
a
ccord
do
c
um
e
ntation
to what git does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Jo
h
an
n
es S
i
xt
t0005: work ar
o
und strange $? i
n
ksh
w
hen program te
r
minated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
u
nio
C Hama
n
o
Merge r
e
m
ote branch 'k
o
/master' into jc/rea
d
-
t
ree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c:
f
ix
a
gr
a
ph ou
t
p
u
t bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Æ
var Arnfjörð
B
jar
m
ason
tests: Use skip_all=*
to skip
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Ham
a
no
Fix
"
read-tree -
m
A B"
priming the cache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli Ba
r
zilay
Reorganize `git-log'
man page to clarify common dif
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -O:
D
o
not pass co
l
or s
e
q
u
e
nce
s
as
filenam
e
s to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
io
C
Hamano
Git
1
.
7
.
2-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C
Haman
o
M
erge branch '
a
b/ta
p
'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
e
rge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
backmerge a f
e
w mo
r
e fixes t
o
1
.
7
.
1
.
X ser
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C Hamano
M
e
rge branc
h
'maint-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine
-
König
rev
-
parse: fix --parse-opt --keep-dashdas
h
--stop-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch
'mg/doc-rev
-
parse-tr
e
epat
h
-syntax'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C H
a
ma
n
o
M
e
rge branch 'tr/re
c
e
i
ve-pack-aliased-u
p
date
-
fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
P
i
erre Habouzit
fix git
branc
h
-m in presence of c
r
oss d
e
vices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon
C
a
sey
t/t0006: spe
c
ify timezone as
E
S
T
5 not EST to
comply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hama
n
o
do not write out in
d
ex wh
e
n
status does
n
o
t have to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Merge b
r
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2010-07-07
H
eiko Voigt
add missi
n
g && to submodule-
m
er
g
e testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nieder
t/R
E
AD
M
E
: documen
t
more tes
t
helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Bra
n
don C
a
sey
Makefile: work
a
rou
n
d ksh's failu
r
e
t
o
h
andle
mi
s
s
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff Ki
n
g
test-
d
at
e
:
fix sscanf type
c
onversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C H
a
m
a
no
Merge
b
ranch
'ma
i
nt
'
commit
|
commitdiff
|
tree
2010-07-06
Dylan
Reid
xdiff:
optimise for
no whitespace difference when igno
r
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
rebase-i: do n
o
t g
e
t fooled
b
y
a
l
o
g m
e
ssage
e
n
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C
H
a
m
a
no
rebase
-
i: style
f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michael J Gruber
Docu
m
entation
:
link to gitrevis
i
ons
r
a
t
her t
h
an git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michael J
G
rube
r
Documenta
t
i
o
n
: gitre
v
isions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michael
J Gruber
Documentation
:
s
p
li
t
off re
v
doc into i
n
clude file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Jakub
N
a
r
ebski
g
itweb
:
Mo
v
e e
v
aluate_gitweb_config o
u
t
o
f run_request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next