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
Add additional testcases for D/F conflicts
2010-07-09
Elijah Newren
Add ad
d
itional t
e
stcases for D/F c
o
nf
l
icts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
J
u
nio C Haman
o
Git 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-23
Er
i
c
R
aymond
D
ocumentation
impr
o
vemen
t
s for th
e
d
e
s
c
ription of
short
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Sy
n
c with
1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Junio C
Hamano
Gi
t
1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Me
r
g
e
b
r
a
nch 'mg/use-default-abbrev-l
e
ngth-in-r
e
v-list
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
Junio C H
a
mano
Merge branch 'wp/doc-filter-directio
n
' into maint
commit
|
commitdiff
|
tree
2010-04-23
Juni
o
C
H
a
m
ano
M
erge branch 'jk/maint-diffstat
-
overflow' into
m
a
i
nt
commit
|
commitdiff
|
tree
2010-04-23
Jun
i
o C Ham
a
no
Merge branch 'da/maint-python-startup' int
o
maint
commit
|
commitdiff
|
tree
2010-04-22
Junio C Hamano
Merge b
r
anch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nie
d
er
Docum
e
ntation/Makef
i
le: fix interrupted
bui
l
ds o
f
user
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jun
i
o C
H
amano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-20
Michael J Gruber
t7012: Mark missing
tests a
s
T
ODO
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
SZEDER Gábor
reflog: remove 'show' f
r
o
m
'expir
e
's
u
sage string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
Ju
n
io C
H
amano
Merge
bra
n
ch 'maint-1
.
6
.
6'
into
m
ain
t
commit
|
commitdiff
|
tree
2010-04-19
Johann
e
s Six
t
MSVC:
F
ix build by
addi
n
g m
i
ssing
t
ermios
.
h dummy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
Junio
C Hamano
Git 1
.
7
.
1-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o C Hamano
Merge
bra
n
ch 'rr
/
remote-
h
elper-doc'
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o
C Hamano
Merge branch 'wp/doc-filter-d
i
rection'
commit
|
commitdiff
|
tree
2010-04-19
Ju
n
io C
Hamano
Merge bra
n
c
h
'jk/m
a
in
t
-d
i
f
fstat-overflo
w
'
commit
|
commitdiff
|
tree
2010-04-19
J
unio
C
Ham
a
no
M
erge branch 'jg
/
auto-in
i
t
ialize-notes-wi
t
h-percent
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Junio C
Hamano
Merge br
a
nch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-04-19
Juni
o
C Ham
a
no
M
erge git://git
.
kernel
.
org/pub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2010-04-18
Ramkuma
r
R
a
m
a
chandra
D
ocumen
t
ation/
r
emote-helpe
r
s:
F
ix t
y
p
os an
d
improve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ram
k
umar Ramachandra
Fixup: Second arg
u
ment may be any arbitra
r
y stri
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ra
m
k
umar Ramacha
n
dra
D
ocumentatio
n
/remote-helpers: Add
invoc
a
tion sectio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
R
a
mku
m
a
r
Ramachandra
Documen
t
ation/u
r
ls: Rewrite to accomodate <transport
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
R
a
m
k
u
mar
R
amachan
d
ra
Doc
u
mentation
/
remote-helpers:
R
ewrite desc
r
iption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Charles
Bailey
D
ocumentation: Describe ot
h
er situations where -z affects
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Jeff King
rebase
-
inte
r
active: s
i
l
e
nce warning
when no commits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Junio C Haman
o
t330
1
:
a
d
d te
s
ts to use --format="%N"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Junio
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-04-17
Matthew Ogilvie
t6006: do no
t
write
t
o
/tm
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Chr
i
s Webb
git-i
n
s
ta
w
eb: pass through
i
n
vokin
g
user's path to
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Junio C Ha
m
ano
g
itweb: simplify
gitweb
.
min
.
* generation
a
n
d
clean
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jo
n
athan Niede
r
t
ag -
v
: use RUN_GIT
_
C
M
D
to run verify-tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Will Palmer
d
ocumen
t
ation: cla
r
i
f
y direction of
core
.
autocr
l
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jef
f
K
i
ng
di
f
f: use l
a
rge
i
ntegers f
o
r d
i
ffs
t
at calculations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Michael J Gruber
t
1
0
1
0
-mktree: Adjust expecte
d
result
t
o co
d
e and document
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Thomas Rast
c
o
mbin
e
d diff: correctly handle truncated
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Niede
r
Document new
"
al
r
eady-merged" rule
for branch -d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jon
a
t
h
an Nieder
Add
.
depend
d
i
re
c
tories to
.
git
i
gnore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-14
Junio C Ha
m
ano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-04-14
Jo
h
a
nnes Gilge
r
p
retty: I
n
itial
i
ze notes if %N is used
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-13
J
a
y Sof
f
ian
Docum
e
nt
a
tion/c
o
nfig
.
txt
:
de
f
ault
g
c
.
agg
r
essiveWind
o
w
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-12
Mar
c
Bra
n
chaud
Do
c
s: Add -X o
p
tion to
git-mer
g
e
'
s synopsis
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
Merg
e
branch 'j
l
/maint-s
u
bmod
u
le-gitfile
-
awar
e
n
ess'
commit
|
commitdiff
|
tree
2010-04-11
Johan
n
es Sixt
Windows: sta
r
t_command
:
Supp
o
rt non-NUL
L
dir in struct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Junio
C Hamano
Sync with 1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
Merge branch 'jc/doc-submi
t
-gmail'
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io C Hamano
Git 1
.
7
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
i
o
C H
a
mano
Merge br
a
nch 'rc/
m
aint-reflog-msg-for-
f
orc
e
d-
b
ra
n
ch
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
Junio C
H
a
mano
blame
documentation: -M/
-
C notice copied lines a
s
well
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Stephe
n
B
o
yd
t3507: Make test executable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io
C
Hamano
Git
1
.
7
.
1-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
J
unio C Hamano
Merge
br
a
nch 'mr/gitw
e
b-jsmin'
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
H
amano
Mer
g
e b
r
anch 'jl
/
maint-submodule-gitfile-awa
r
eness'
commit
|
commitdiff
|
tree
2010-04-10
Jens L
e
hmann
Teach diff --subm
o
dule and
s
ta
t
us to handl
e
.
git
f
iles
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
J
unio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Let check_
p
r
e
imag
e
()
use me
m
set(
)
to initializ
e
"str
u
ct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
H
amano
Merg
e
branch 'ef/maint-empty
-
commit-log' i
n
to maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
M
erge
b
ranch 'jc/c
o
n
flict-
m
ar
k
er-siz
e
'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-04-10
J
u
n
i
o C Hamano
Merge branch 'sp/maint-http-backend-die-
t
r
igger
s
-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C H
a
mano
M
e
r
g
e br
a
nc
h
'mg/maint-send-email-lazy-editor'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ham
a
no
Merge b
r
anch 'rr/ima
p
-sen
d
-unconfuse-from-line' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C Hamano
Me
r
ge bran
c
h '
r
b/maint-p
y
t
hon-path' into m
a
int
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C Hamano
Merge branch 'gh/maint-
s
tash-show-erro
r
-mes
s
a
ge'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge bran
c
h 'mg/mailmap-u
p
date' i
n
to maint
commit
|
commitdiff
|
tree
2010-04-10
Jun
i
o C Hamano
Merge branch 'bc/maint-daemon-sans-ss-family' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray Chuan
fetch
/
push: fix u
s
age strin
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C
Hamano
Merge branch 'rc/maint
-
r
e
flog-msg-for
-
forced-branch
'
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray Chuan
b
ranch: say
"
R
eset to" in r
e
fl
o
g entries
f
o
r
'gi
t
b
r
a
nch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-09
Junio
C
Hamano
Me
r
g
e early parts o
f
jk/cached-text
c
onv
commit
|
commitdiff
|
tree
2010-04-09
J
u
nio
C Hamano
diff
.
c: wor
k
around pointer cons
t
n
e
ss warnings
commit
|
commitdiff
|
tree
2010-04-09
J
unio
C Hamano
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2010-04-08
Jeff Ki
n
g
do
c
s: clarif
y
"bran
c
h
-l"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Junio C Ha
m
ano
Submitting
P
atches: update G
M
ail sect
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Juni
o
C
Hamano
Merge branch
'
mg/notes-reflog'
commit
|
commitdiff
|
tree
2010-04-07
Junio C Hamano
Merge branch 'jn/m
a
ilinfo-s
c
i
ssors'
commit
|
commitdiff
|
tree
2010-04-07
Jeff
King
fi
x
typos and gra
m
ma
r
in 1
.
7
.
1 draft rel
e
a
s
e notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Brandon Case
y
notes
.
h: declare bit fie
l
d as
u
ns
i
gned to
s
i
lence
compi
l
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Junio C H
a
mano
Git
1
.
7
.
1-r
c
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Junio C
Hamano
Mer
g
e br
a
nch '
d
a/maint-python-startup'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Mer
g
e branch
'ic/ba
s
h-completion-rpm'
commit
|
commitdiff
|
tree
2010-04-06
Ju
n
io C Haman
o
Mer
g
e branch 'sb/fmt-merge-msg'
commit
|
commitdiff
|
tree
2010-04-06
Junio C
Hama
n
o
Merge
b
ra
n
ch 'jc/conflic
t
-
marker-size'
commit
|
commitdiff
|
tree
2010-04-06
J
unio C
H
am
a
no
Merge branch 'ef/maint-empty-commit
-
log'
commit
|
commitdiff
|
tree
2010-04-06
J
u
nio C Hamano
Merge br
a
n
c
h 'sg/bash-completio
n
'
commit
|
commitdiff
|
tree
2010-04-05
Junio
C Hamano
Rever
t
"Link against libiconv on IRIX"
commit
|
commitdiff
|
tree
2010-04-04
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-04-04
Ta
y
Ray Chuan
p
a
ck-proto
c
o
l
.
txt: fix pkt-li
n
e
l
e
ng
t
hs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
T
ay Ray Chuan
p
a
c
k-pro
t
ocol
.
txt: fi
x
s
pellin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jon
a
than
N
i
eder
Teach
mailinf
o
%<
as an alternative sciss
o
rs mark
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o
C Hamano
Merge branch 'mb/
r
ebase-i
-
n
o
-
f
f
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ha
m
a
no
Merge
branch
'sp/maint-http-b
a
ckend
-
die-trigger
s
-di
e
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
r
g
e branch 'rr/imap
-
send-unc
o
nfuse-
f
rom-line'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ham
a
no
Merge branch 'mg/use-
d
efaul
t
-abb
r
ev-l
e
ngth-in-rev-li
s
t'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merg
e
bran
c
h
'mg/maint-send-email-lazy-e
d
itor'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch
'rb/maint-p
y
thon
-
path'
commit
|
commitdiff
|
tree
next