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
Jonathan Niede
r
merge script: twea
k
unmerged
files
message to match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
me
r
g
e
s
crip
t
: --squash
,
--ff
f
rom unborn branch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Ni
e
d
er
fmt-merge
-
msg
-
m t
o
ov
e
rride merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge-ba
s
e
-
-inde
p
e
ndent
to print red
u
ced pare
n
t l
i
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merg
e
-base --octopus t
o
mimic
s
how
-
branch
-
-
merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Nieder
Docum
e
nt
a
tion: add
a
SEE ALSO sec
t
io
n
for mer
g
e-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
t6200 (fmt-mer
g
e
-msg)
:
style nit
p
icks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010
(
mer
g
e-base): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t7600 (m
e
r
ge): test merge fro
m
bra
n
ch yet to
be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
ed
e
r
t
7600
(mer
g
e): check reflog entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than Nieder
t7600 (
m
erge)
:
do not laun
c
h
gitk for --debu
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t7600 (merge)
:
moder
n
ize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
t
han Nieder
merge: do
n
o
t mista
k
e (a
n
cestor of) tag for branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ha
m
an
o
Git
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C
H
a
mano
tes
t
s: co
r
re
c
t "does reflog exist?"
test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Case
y
t
/
: w
o
rk aro
u
nd
one-s
h
o
t
variable assig
n
ment with
tes
t
_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
ieder
t/R
E
ADME: cor
r
ect an exception whe
n
breaki
n
g a && chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
ase
y
t/{t5541
,
l
i
b-h
t
tpd}: rep
l
a
c
e pro
b
lematic '!()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
a
sey
t/t3700: convert two uses of negat
i
on operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C
H
a
mano
M
erge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2010-07-20
B
r
a
n
don Casey
t
/REA
D
ME: cla
r
ify
test_must_fail de
s
cript
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Check
s
i
ze
of path buffer
b
efore writing i
n
to it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
i
o C Hamano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thi
e
low
update-server-info: Shorten
rea
d
_pack_info_f
i
le(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar Arnfjör
ð
Bjar
m
aso
n
g
i
t ad
d
: Add --ignore-mi
s
sing to SYN
O
PSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
var Arnfjörð Bjarmaso
n
g
i
t submodule add
:
Remove old docs about implici
t
-f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens
Lehm
a
nn
git submodule add: Require
the
n
ew --force option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C Ha
m
ano
Merge b
r
anc
h
'jl/add-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id A
g
u
i
lar
Do
c
umenta
t
ion:
Explain git-me
r
getool's
u
se of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
Hamano
Merge branc
h
'jc/diff-merge-ba
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Ra
s
t
Only run aggre
g
ate-results over actual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
Nieder
Ad
d
a sample us
e
r
for the
s
v
ndump library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
a
m
ano
di
f
f A
.
.
.
B: do not limit the syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Haman
o
Merge branch 'jn
/
p
agin
a
te-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merg
e
b
ranch 'w
p
/merge-
t
ree-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge branch 'js/
m
erge-r
r
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio
C
H
amano
M
e
rge branch 'jc/diff-
m
erge
-
base-mul
t
i
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hama
n
o
M
erge branch 'ns/merge-recursive-uptod
a
te'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
ma
n
o
Merg
e
branch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch
'
eb/d
o
c
-log
-
m
anpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge br
a
n
ch 'jn/grep-open
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Ham
a
n
o
Mer
g
e branc
h
'mg/r
e
visio
n
-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge branch 'j
k
/
m
a
in
t
-status-keep-index-timestam
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e branch 'jc
/
rebase-i-c
o
mmit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
m
ano
Merge branch 'ab/su
b
module
-
add-f'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
H
amano
Merge br
a
nch '
b
c/main
t
-makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o
C
Ham
a
no
Merge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
D
o
cumen
t
ation
:
add submo
d
ule
.
*
t
o t
h
e
b
ig
c
o
n
figurat
i
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Ni
e
der
gitmodules
.
5:
u
rl can be a relativ
e
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar
S
u
nkara
gitweb:
fix
esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonat
h
an Ni
e
d
er
git --paginate: paginate external commands
a
gain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Sof
f
ian
MERGE_RR
i
s in
.
git, no
t
.
git
/
rr-
c
ac
h
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Wi
l
l Palmer
merge-tree:
fix wh
e
r
e
t
w
o branche
s
shar
e
no
c
hang
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
W
i
l
l Palme
r
a
d
d basic tes
t
s fo
r
merge-tr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Ha
m
ano
Git
1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Juni
o
C Hamano
Merge branch
'jc
/
r
e
ad-tree-cache
-
tr
e
e
-
f
ix'
commit
|
commitdiff
|
tree
2010-07-14
Ra
j
a R Harinat
h
Use dev_t
f
o
r
device id (st_d
e
v) from stat in
s
etu
p
_git_dire
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
d
iff A
.
.
.
B: give
o
ne possible di
f
f when
ther
e
are
m
or
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Juni
o
C Ham
a
no
Me
r
ge branch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2010-07-13
Oren H
e
ld
g
i
t fet
c
h document
a
tion: describe short
'-p' synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vaj
n
a
format
-
patch: d
o
cument t
h
e format
.
to configur
a
tion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git add:
A
dd the "--ignor
e
-missing" option for the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael
J
G
ruber
test-li
b
: TAP compliance for skip
p
ing tests on request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Mi
c
h
ael J G
r
uber
t
est-l
i
b: simplify GIT_SKIP_TESTS
loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Juni
o
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jona
t
ha
n
Niede
r
t30
0
0 (ls-files
-
o): mode
r
ni
z
e style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
F
r
ed
r
ik
Skolml
i
Documentation: Spelling fix
in p
r
otocol-cap
a
b
i
l
i
ties
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
las Sebre
c
ht
merge-recu
r
sive: use
"up-
t
o-dat
e
" instead of "
u
p
t
oda
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
las Seb
r
echt
checkout: accord documentation to what git
d
oes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Sixt
t
0
005: w
o
rk aroun
d
strang
e
$?
i
n
ksh when program
t
e
rminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
nio
C
Hamano
Merge re
m
o
t
e branch 'ko/master' into jc/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c: fix a
graph output
bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Æv
a
r Arnfjör
ð
Bjarmason
tests: Use skip_a
l
l=*
t
o sk
i
p tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
F
i
x
"read
-
tree -m A B" primin
g
the cach
e
-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli Ba
r
zilay
Reorganize `git
-
log' man
pag
e
to clarify common di
f
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -O
:
Do not pa
s
s
c
olor sequences as
f
i
l
enames
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C Hamano
Git 1
.
7
.
2-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
a
mano
Me
r
ge bran
c
h 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
ma
n
o
ba
c
k
mer
g
e
a few mo
r
e fixes
t
o
1
.
7
.
1
.
X series
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge br
a
nch 'main
t
-1
.
6
.
4'
into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe K
l
eine-Kö
n
i
g
r
ev
-
parse: f
i
x --parse
-
opt --keep-dashda
s
h --stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Haman
o
Me
r
ge
b
r
a
nch 'mg/
d
oc-re
v
-parse-tr
e
epath-synt
a
x'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C Ham
a
no
Merg
e
branch '
t
r/receive
-
pack-
a
l
i
ased-u
p
date-fix'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Habo
u
zit
f
i
x git
b
ranch -m in presence of cros
s
d
e
vices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
B
r
andon Case
y
t/
t
0006:
spec
i
fy tim
e
zone as
E
ST5 not EST to comp
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do no
t
w
r
ite o
u
t index when st
a
t
u
s does not
h
a
ve
to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o
C
Hamano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko
Voig
t
ad
d
missing && to su
b
module-merge testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan N
i
eder
t/README: do
c
umen
t
m
o
r
e
tes
t
helper
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Bra
n
don
C
asey
Make
f
il
e
: work ar
o
und ksh's failure to han
d
le m
i
s
sing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Jeff
King
t
est-date
:
fix sscanf type
c
o
nv
e
rsion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Haman
o
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-06
Dy
l
an Reid
xdiff:
op
t
i
mise
f
or no
whitesp
a
c
e
differe
n
ce
whe
n
i
g
norin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
Ju
n
io C Hamano
rebase-
i
:
d
o not get fooled
b
y a log message ending
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-06
J
unio
C
Hamano
re
b
ase-i:
s
tyle fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Michael J Gruber
Docu
m
en
t
ation: l
i
nk to gi
t
revis
i
ons rather than git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Micha
e
l J Gr
u
ber
D
o
cumentation: gitrev
i
si
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Michael J Gruber
Documentation:
s
plit
off rev
d
oc into
include file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-05
Jakub Narebski
git
w
e
b
:
M
ove eva
l
uate_gitweb_
c
o
n
fig out of run_reques
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next