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 branch 'jc/conflict-marker-size'
2010-04-06
Junio C Hamano
M
erge br
a
nch
'
j
c/c
o
n
f
lict-marke
r
-siz
e
'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge branch 'ef/m
a
int-e
m
pty-commit-log'
commit
|
commitdiff
|
tree
2010-04-06
Junio
C Hama
n
o
Merge branch
'sg/bash
-
completion'
commit
|
commitdiff
|
tree
2010-04-05
Junio C Hama
n
o
Revert "Link against libi
c
o
n
v
on IR
I
X"
commit
|
commitdiff
|
tree
2010-04-04
J
unio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray
Chuan
p
a
c
k
-
p
rotoco
l
.
txt: fix pkt-l
i
n
e
le
n
gt
h
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Chuan
p
ack-protoc
o
l
.
txt: fix spelling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'mb/re
b
ase-i-
n
o-ff'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C Hamano
Merg
e
branch
'sp
/
maint-http-backend-die-trigg
e
rs-d
i
e
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C
Ha
m
ano
Me
r
ge br
a
nch 'rr/imap-sen
d
-unconfuse-from-line'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
branch 'mg/use-defau
l
t-abbrev-le
n
g
th-in-rev-list
'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
M
e
rge
branch 'mg
/
mai
n
t-send-
e
m
a
i
l-lazy-ed
i
tor'
commit
|
commitdiff
|
tree
2010-04-03
J
u
n
i
o C Hamano
Merge branch 'rb
/
main
t
-python
-
path'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
i
o
C
Hama
n
o
Merge branch
'
jn/me
r
ge-
d
iff3-l
a
bel'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branc
h
'ef/cherry-ab
b
r
e
v'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
a
mano
Me
r
g
e branch 'bw/template-tool-b
u
ildc
o
n
fig'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'mg/mail
m
ap-u
p
date'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
Merge bran
c
h
'
bc/
t
5505-fi
x
'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C Hamano
M
e
rge branch 'gh
/
maint
-
stash-show
-
erro
r
-
m
e
ssage'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C
Hamano
Merge
branch
'rs/thr
e
aded-grep-context'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
b
ranch 'bc/
m
a
int-daemon
-
sans-ss-family'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Hamano
Merge branch 'b
c
/a
c
l
-test
'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C
H
amano
Me
r
ge branch
'
ja/s
e
nd-e
m
ail-eh
l
o'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hamano
M
erge branch
'
d
o
/
reba
s
e-i-arbitr
a
ry'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
H
amano
Merge
b
ranch
'ak/everyday-git'
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Mak
e
file: futu
r
e-proof Cygwin v
e
rsion check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Y
O
NETANI Tomokazu
Fix
_
X
OPEN
_
S
OURCE
p
r
o
bl
e
m on DragonFly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Markus
Heidelbe
r
g
builtin/commit:
r
emove unnec
e
ssary variabl
e
d
e
finition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Markus Heidelberg
builti
n
/
commit: fix
d
u
p
licated sent
e
n
c
e
in a
c
omment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Eric
Raymond
I
n
tegrate ver
s
i
o
n 3
c
iabot scripts
into contrib/
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Eric
Blake
Makefile: up
d
ate d
e
fa
u
lts
f
o
r
m
o
de
r
n
C
y
gwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
J
unio C Ha
m
a
n
o
Sync with
1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
J
unio C Hamano
Git 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Ju
n
io C Hamano
Merge branch
'jc/maint-r
e
fs-dangl
i
ng' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2010-03-31
H
olger Weiß
D
o
cumentation: show-ref
<patt
e
r
n>s are optio
n
al
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
H
o
lge
r
Weiß
Link against li
b
iconv
on
I
RIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Don't redefine htonl
and ntohl on big-e
n
di
a
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jakub Nareb
s
ki
g
i
tw
e
b: git_get_project_
c
onfig
r
equires only $git_
d
i
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
J
an Stęp
i
e
ń
Updated the usage string of git reset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Greg Ba
c
on
Documentat
i
on: Clarify
support for smart
H
TTP
backend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
Windows: f
i
x
utim
e
() for read-only files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
J
ohann
e
s Sixt
dif
f
: fix textconv erro
r
zombies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
J
unio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
Kevin Ballard
format-patch: Squelch 'fa
t
al: Not a range
.
" error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C Hamano
Upda
t
e draft r
e
leas
e
notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C H
a
mano
Merge branc
h
'cc/
c
h
e
rr
y
-pick-ff'
commit
|
commitdiff
|
tree
2010-03-29
J
unio C Hamano
Me
r
ge bran
c
h 'sb/
n
otes-parse-opt
'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Tho
m
as Rast
rebase -
i
: make p
o
st-rew
r
i
t
e
w
or
k
for
'edit
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C Hamano
Prepare
fo
r
1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Haman
o
Merg
e
b
r
a
n
ch 'cp/a
d
d-u-pa
t
hspec'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
M
e
rge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-29
J
unio C H
a
m
ano
t
9
3
50
:
f
ix care
l
ess
u
se of "cd"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
d
ifftool: Fix
'
--gu
i
' when di
f
f
.
gui
t
oo
l
is
unconfigured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Sverre Rabbelier
fast-
e
xport: don't s
e
gfault whe
n
marks file
c
annot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Chri
s
Webb
imap-sen
d
: suppr
e
ss w
a
rn
i
ng
about
cleartext
password
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Michael J Gru
b
er
send-email: lazil
y
a
s
sign e
d
it
o
r
variabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Juni
o
C Hama
n
o
diff --check
:
honor
conflict
-
marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
J
unio C Ha
m
an
o
M
erge branch 'jh/ma
i
nt-
s
ubmo
d
ule-status-in-vo
i
d
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C H
a
mano
Merge branch 'tr/n
o
tes-
d
ispla
y
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
erge branch 'jl/su
b
module-diff-dirtiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
erge branch 'pb/log-first-parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
amano
Merge branc
h
'jc/m
a
int-refs-dan
g
ling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ham
a
no
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-24
J
unio C
Hamano
Me
r
ge branch 'j
c
/co
l
o
r
-
a
ttr
s
' into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge
b
ran
c
h 'jk/maint-add-i
g
nored-dir' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hama
n
o
M
erge
b
ranc
h
'bg/
a
pply-fix-bla
n
k
-at-eof' into maint
commit
|
commitdiff
|
tree
2010-03-24
Marc Bran
c
haud
Teach r
e
b
a
se
t
he --no
-
f
f option
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Shawn O
.
Pea
r
ce
http-backe
n
d:
D
on't infinite
loop during die()
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
.
Tyler
B
allance
Correct ref
e
r
e
nces to /us
r
/bin/py
t
hon which does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Mark
u
s He
i
d
elb
e
rg
Documentation
:
explain the
m
e
a
ning of "-
g
" in
g
it
-
des
c
ribe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Michael J Gruber
r
e
v-li
s
t
:
use default
abbrev
l
eng
t
h when abbrev
-
c
ommit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
R
a
mk
u
mar R
a
mac
h
a
n
d
ra
imap-send: Remove limit
a
t
ion on message body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Ju
n
i
o C Hama
n
o
Sync with Gi
t
1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
J
u
nio C Ham
a
no
Git 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C
Hamano
M
e
rge branch 'maint
-
1
.
6
.
6
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l
J Gruber
.
ma
i
lmap: Map the the fi
r
st submissio
n
s of MJG
by
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-
L
und
ls: remove
r
edundant lo
g
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
E
r
i
k Faye-Lund
cherr
y
: support
--
a
bbrev option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
i
ch
a
e
l
J
G
ruber
D
ocumentation/git-clon
e
:
T
ransform descriptio
n
list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gr
u
ber
Documentation/urls: R
e
move s
p
urious examp
l
e markers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ael
J Gruber
D
ocum
e
nta
t
ion/
g
it
d
i
f
fcore: Re
m
ove misleading date in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
i
cha
e
l J
Gruber
Docume
n
t
ation/git-reflog: Fix f
o
rmatt
i
ng of com
m
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik F
a
y
e-Lund
rev
-
list: fix --pretty=oneline with em
p
ty message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than N
i
e
d
e
r
merg
e
-recursive:
a
dd a la
b
el fo
r
a
ncestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick, r
e
vert: a
d
d a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nied
e
r
r
e
vert:
cla
r
ify label on co
n
flict h
u
nk
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
compa
t
: ad
d
mempcpy()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Ni
e
der
checkout -m -
-
conflict=dif
f
3
:
add a label f
o
r
a
ncestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
merge_trees(): add ances
t
or
label parameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan
N
ied
e
r
merge_file(): add c
o
m
m
e
nt
e
xplaining b
e
havior wrt
c
onfl
i
ct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
checkout
-
-confli
c
t=diff3: add a label for
a
n
cestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nie
d
er
ll_me
r
g
e(
)
: ad
d
ances
t
or l
a
be
l
p
a
rameter f
o
r
diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
a
n
Nieder
merge-file --diff3: add
a la
b
el for an
c
est
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
x
dl_merge()
:
mov
e
file1 a
n
d
file2 label
s
to
x
m
param
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
xd
l
_merge(): add optio
n
a
l
ancestor label
to dif
f
3
-
s
t
yl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
tests:
d
ocument cherry-pick
b
eha
v
ior in face of conf
l
icts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
natha
n
Niede
r
t
e
sts: doc
u
ment format of conflicts from checkou
t
-m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
m
a
i
l
map: Entries for
Alex Bennée, Deski
n
Mil
l
er, Vitaly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nie
d
er
revert: fix
tiny me
m
ory le
a
k in cherry-pick --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next