repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/conflict-marker-size'
2010-04-06
Junio C Ha
m
ano
Me
r
ge
b
r
a
nch 'jc/conflic
t
-marker
-
si
z
e'
commit
|
commitdiff
|
tree
2010-04-06
Junio
C
Hamano
Merge branch 'ef/maint-empty-commit-log'
commit
|
commitdiff
|
tree
2010-04-06
Junio C H
a
mano
Merg
e
b
ran
c
h 'sg/bash-completion'
commit
|
commitdiff
|
tree
2010-04-05
Jun
i
o C
Ham
a
n
o
Reve
r
t
"
L
ink
a
gainst libiconv
o
n
I
RIX"
commit
|
commitdiff
|
tree
2010-04-04
Juni
o
C
H
am
a
no
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Chuan
pa
c
k-protoco
l
.
tx
t
:
fix pkt-line lengt
h
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
T
ay Ray Chuan
pack-protocol
.
txt: fix spelling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Hamano
M
erg
e
branch 'mb/rebase-i-no-ff
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
amano
Merg
e
b
ranch
'sp/maint-http-backend-die-trig
g
ers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
ama
n
o
Merge
b
ranch 'rr/i
m
a
p
-
sen
d
-
unconfuse-from-line'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o
C Hamano
M
e
rge branch 'm
g
/use-defaul
t
-
a
b
brev-len
g
t
h-
i
n-rev-list'
commit
|
commitdiff
|
tree
2010-04-03
J
uni
o
C Hama
n
o
Merge br
a
nch '
m
g/maint-sen
d
-e
m
ail-lazy-edi
t
or'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
m
a
no
Merge branch 'r
b
/maint-py
t
hon-p
a
th
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
rge branch 'jn/m
e
rge-diff3-label'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Ham
a
n
o
Merge bra
n
ch 'ef/cherry-abbrev'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
branch 'bw/templat
e
-
t
ool-build
c
onfig'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branc
h
'mg/mailmap-update'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Merge branch 'bc/t5505-
f
ix'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Me
r
ge branch
'
gh/m
a
int-stas
h
-
s
h
o
w-e
r
ror-message
'
commit
|
commitdiff
|
tree
2010-04-03
J
u
ni
o
C Hamano
Merge branch 'rs/
t
hreaded-grep-con
t
ext'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C
Ham
a
no
Me
r
ge bra
n
ch
'bc/maint-daemon-sans-ss-f
a
mily'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
rge branch 'bc/acl-test'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C Hamano
Merge branch '
j
a/s
e
nd-email-eh
l
o'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
ma
n
o
Mer
g
e branc
h
'd
o
/reba
s
e-i-arbitrary'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio
C
Hamano
Mer
g
e
b
r
a
nch 'ak/
e
veryd
a
y-
g
it'
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makefile: fu
t
ure-proof Cy
g
w
i
n version check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
YONET
A
NI Tomokazu
Fi
x
_XOP
E
N_SOUR
C
E pr
o
b
l
em on
Drag
o
nFly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Markus H
e
i
d
elberg
builtin/commit: re
m
ove u
n
nece
s
sary
v
ariab
l
e definition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Markus
H
e
i
delbe
r
g
builtin/commit: fix duplica
t
ed sentenc
e
in a comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Eric Ra
y
mond
Int
e
grate versi
o
n
3
ciabot scripts into contrib/
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Eric B
l
ake
Makefil
e
: update def
a
u
l
ts for mo
d
ern Cyg
w
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Juni
o
C
Hamano
Sync with 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Juni
o
C Hamano
Git 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
J
u
n
i
o
C
H
amano
M
e
r
g
e
b
ranch 'jc
/
main
t
-refs-dan
g
ling
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2010-03-31
H
o
lger We
i
ß
Doc
u
ment
a
tio
n
:
sh
o
w-ref <
p
attern>s are optio
n
a
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holge
r
Weiß
Link against libi
c
onv
on
I
RIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holg
e
r Weiß
Don't redef
i
ne
h
t
onl and ntohl on bi
g
-e
n
dia
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jakub Narebski
gitweb: git_get_project_conf
i
g requir
e
s
only
$
git_dir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jan
Stępień
Upda
t
ed the usage string of git reset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Greg Bac
o
n
Documentat
i
on:
Clarify support for smart HTTP bac
k
end
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
J
ohannes Sixt
W
i
ndow
s
: fix
u
time() f
o
r read-only files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
diff: fix textcon
v
erro
r
z
ombies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Junio C Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
Kevin
B
all
a
rd
format-pa
t
ch
:
S
q
uelch
'fat
a
l
:
Not a r
a
nge
.
" erro
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
J
u
n
i
o
C
Hamano
Up
d
ate
draft r
e
lease n
o
t
es to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C H
a
mano
Merge
branc
h
'cc/
c
herry-p
i
ck-ff'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
M
e
rge br
a
nch 'sb/notes-parse-op
t
'
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Thomas R
a
s
t
rebase -i:
make
p
o
st-re
w
r
i
te work for 'edit'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C
H
amano
Prepare for 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Mer
g
e branch '
c
p/ad
d
-u-pathspec' into maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2010-03-29
J
unio C Hamano
t9350
:
fix careles
s
us
e
of "cd"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '-
-
gui' w
h
en diff
.
guitool is unco
n
f
i
gure
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
S
v
erre Rabbelier
f
a
s
t-
e
xp
o
rt: don't segfault when mar
k
s
file canno
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Chris
Webb
im
a
p
-
se
n
d
:
s
u
ppre
s
s warni
n
g
about clearte
x
t
p
asswor
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Michael J Grub
e
r
sen
d
-email
:
lazily assign edit
o
r
v
a
riab
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Junio
C
Hamano
diff -
-
check:
honor conflict
-
marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o
C Hamano
Mer
g
e branch '
j
h/maint-submodule-stat
u
s-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch 'tr/not
e
s-display'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
amano
M
e
rge branch 'jl/s
u
bmod
u
le-diff-dirtiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
a
m
ano
Merge
b
r
anch
'pb/log-first-parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
ama
n
o
M
erge br
a
nch 'jc/
m
aint
-
r
ef
s
-d
a
ngling'
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Merge
b
ranc
h
'jc/color-attr
s
'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch 'jk/m
a
int-add-igno
r
e
d
-dir' i
n
to
m
aint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ham
a
no
Merge branch 'bg
/
apply-
f
i
x
-blank-at-
e
o
f' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2010-03-24
Marc
Branchaud
Teach rebase the --no
-
f
f optio
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Shaw
n
O
.
Pearce
http-backend: Don't infinite loop duri
n
g
d
i
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
R
.
Ty
l
e
r Ball
a
nce
C
o
rrec
t
r
efere
n
c
es to /usr/bin/pytho
n
w
h
ich does no
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Markus Heidelberg
Documentat
i
on: explain
t
he mean
i
ng of "-g" in git-describe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Mi
c
hael
J
Gruber
rev-list: use d
e
fault abbrev length w
h
en abbrev-c
o
mmit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
R
amkumar Ram
a
chandra
ima
p
-s
e
n
d:
R
emove limitation
on
m
es
s
age b
o
d
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C
H
amano
Sync
w
ith Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
J
u
n
i
o C Hamano
Git 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Me
r
ge
b
ranch 'ma
i
n
t
-
1
.
6
.
6' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
h
ae
l
J Grube
r
.
ma
i
lmap: Map the the first subm
i
ssions of MJG by
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
ls: remove redundant lo
g
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik
F
aye-
L
und
ch
e
rr
y
: support --a
b
brev opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
i
chael J Gruber
Documentation/git-clone: Transfor
m
de
s
cription lis
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grube
r
Docume
n
tatio
n
/urls: Remov
e
spu
r
ious example mar
k
ers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
i
chael J G
r
uber
D
o
cume
n
tatio
n
/git
d
iffcore: Remove mis
l
eading date in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J Grub
e
r
D
o
c
u
mentation/git-reflog: Fix formatting o
f
c
o
mm
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
rev-lis
t
: fix --pretty=oneli
n
e with
e
mpty me
s
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
merge-recursive: add a label fo
r
ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ch
e
rry
-
pi
c
k, revert: add a labe
l
for an
c
estor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
revert:
c
larify la
b
e
l on con
f
l
ict hunks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
c
ompa
t
: add me
m
pc
p
y
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Niede
r
ch
e
ckout -m --co
n
flict=d
i
f
f
3: a
d
d a lab
e
l f
o
r
a
ncestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
Nieder
mer
g
e_trees(): ad
d
ancestor label p
a
ra
m
e
t
e
r for
d
i
ff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_file(): add comme
n
t expla
i
ni
n
g behavior
wrt conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout --c
o
nflict=diff3: add
a label
f
o
r a
n
cest
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
l
l
_merge
(
): add
a
ncest
o
r label par
a
met
e
r f
o
r
diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge
-
file --diff3: add a labe
l
for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
i
e
der
xdl_me
r
ge(
)
: move
f
ile
1
and file2
l
abe
l
s to xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
x
d
l_merge
(
):
a
d
d
optional
a
nces
t
or la
b
el to diff3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
tests:
d
ocume
n
t
cherry-pick behavi
o
r in f
a
ce of confli
c
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
t
ests: docum
e
nt format of c
o
nfl
i
c
ts f
r
om che
c
kout -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
i
ch
a
el J Grub
e
r
.
m
a
ilmap: Entries for
A
l
e
x
Bennée, Deskin Mi
l
ler, Vitaly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
revert: fix tiny
m
e
m
ory leak in cherry-pick --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next