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_recursive: Fix renames across paths below D/F conflicts
2010-07-09
Elijah N
e
wren
m
erge
_
recu
r
s
i
ve:
F
ix renames acro
s
s paths
b
elow D/F
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
El
i
j
ah Newren
me
r
ge-r
e
cursive
:
F
i
x D/F confl
i
cts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Alexander
Gladys
h
A
d
d
a
r
ename + D/F conflict
t
es
t
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
El
i
j
a
h Newren
Add
add
i
t
ional testcases for
D
/F conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
Junio C Hamano
G
i
t 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
Junio
C
Hamano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-04-23
Eric Raymon
d
Documen
t
ation impr
o
ve
m
ents f
o
r
the description of short
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Ju
n
io C
H
a
mano
Sync wi
t
h
1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Ha
m
a
n
o
Git 1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Juni
o
C Hamano
Merge branch 'mg/u
s
e-de
f
ault-abbrev-length-
i
n-rev-lis
t
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
Junio C Haman
o
Merge bra
n
ch
'wp/doc-filter-direct
i
on' into mai
n
t
commit
|
commitdiff
|
tree
2010-04-23
Junio C
Ham
a
no
Merge branch 'jk/mai
n
t-d
i
ffsta
t
-overf
l
o
w
' in
t
o maint
commit
|
commitdiff
|
tree
2010-04-23
Junio C Ha
m
ano
Merg
e
b
ranch 'da/maint-py
t
hon-startu
p
' into maint
commit
|
commitdiff
|
tree
2010-04-22
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-04-22
Jo
n
athan Nieder
Documentation/
M
ak
e
file: fi
x
interrup
t
ed buil
d
s o
f
u
s
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
Ju
n
io C Hamano
M
erge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2010-04-20
M
ichael J Gruber
t70
1
2: Mark m
i
ssing tests as TODO
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
S
ZEDER Gábor
reflog: remove 'show' from
'
expire's
usage string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
J
u
nio C Hama
n
o
Merge branch 'maint-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-04-19
Joh
a
nnes Sixt
MSV
C
:
F
ix bui
l
d by adding missin
g
termios
.
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 branch
'rr/
r
emote-
h
elper-doc'
commit
|
commitdiff
|
tree
2010-04-19
J
u
n
io C Ham
a
no
Merge bran
c
h 'wp/doc-filter-direction
'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Ha
m
ano
Merge branch 'j
k
/
m
aint-diffstat-overflow'
commit
|
commitdiff
|
tree
2010-04-19
Junio
C Hamano
Merge branch 'jg/
a
ut
o
-initi
a
li
z
e-notes-with-percen
t
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-04-19
J
u
nio C Hamano
Me
r
ge git://git
.
kernel
.
org/pub/sc
m
/gi
t
k/gi
t
k
commit
|
commitdiff
|
tree
2010-04-18
Ramk
u
mar Ram
a
chandra
Docume
n
tation/re
m
ote-helpers:
F
ix typos
a
nd improv
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
R
a
mkum
a
r Ram
a
chandra
Fixup:
S
econd argumen
t
may
b
e any arbitrary string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramach
a
ndra
Docum
e
nta
t
ion/
r
emote
-
hel
p
ers: Add i
n
v
o
c
a
tion sec
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ramku
m
ar R
a
machandra
Doc
u
me
n
tation/urls: R
e
write to accomo
d
ate
<
t
ransport
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ram
k
u
m
ar Ramachandra
Docume
n
tation/rem
o
t
e-helper
s
: Rewr
i
te de
s
cript
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
C
h
arles Bailey
D
ocu
m
e
n
t
at
i
on: Describe ot
h
er si
t
uations where -z affects
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Jeff Kin
g
rebase-int
e
ra
c
ti
v
e: sile
n
c
e
warning when no
c
ommit
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
J
u
ni
o
C
Hama
n
o
t3301: add
t
ests to us
e
--format="%N"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-04-17
Mat
t
h
ew
O
g
i
lvie
t6006: do not wri
t
e
to /tmp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Chri
s
Webb
git-inst
a
web:
p
a
s
s
t
hrough invo
k
ing user's path t
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hamano
gitweb: s
i
m
p
lify gitweb
.
min
.
* ge
n
eration and cle
a
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jo
n
a
t
h
a
n Nieder
t
ag -v: use RUN_GIT_CMD to run ver
i
fy
-
tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Will Palmer
d
o
cumen
t
ation
:
clar
i
f
y
direct
i
on of co
r
e
.
aut
o
crlf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
J
eff King
d
iff: us
e
large integers for diffstat calculat
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
M
i
chael J Gruber
t1010-
m
ktree
:
A
djust expected result
t
o co
d
e and d
o
cu
m
ent
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Thomas Ra
s
t
combined diff:
c
orre
c
tly h
a
ndle
t
runca
t
ed file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Docu
m
e
n
t new "
a
lready
-
mer
g
ed"
r
u
le for br
a
nch -
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan N
i
eder
Ad
d
.
depe
n
d directorie
s
to
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-14
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-14
Johannes Gi
l
ger
pretty: Initialize not
e
s if %N is u
s
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-13
J
a
y Soffian
Documentation/config
.
tx
t
: defaul
t
gc
.
aggr
e
ssiv
e
Window
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-12
Marc
B
ranchaud
Docs: Ad
d
-X option to git-merge's synopsis
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
i
o
C
Hamano
Merge br
a
nch '
j
l/mai
n
t-su
b
module
-
gitfil
e
-awareness'
commit
|
commitdiff
|
tree
2010-04-11
Joh
a
nnes Sixt
Windows
:
sta
r
t_command: S
u
p
p
ort non-NU
L
L dir in str
u
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Junio C
Hama
n
o
S
y
nc with 1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io C Hamano
Merge br
a
nch 'jc
/
d
o
c-submit-gmail'
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
Git 1
.
7
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
M
e
rg
e
b
ran
c
h 'rc/maint-reflog-msg-for-fo
r
ced-branch
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
J
unio
C
Ham
a
n
o
blam
e
d
o
cumentati
o
n: -M/-C not
i
ce cop
i
ed lin
e
s as well
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
St
e
phen
B
oy
d
t
3
507: Make test
e
xecu
t
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Haman
o
Git 1
.
7
.
1-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C H
a
mano
Merge b
r
anch 'mr/gitw
e
b-jsmin'
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
i
o
C Hamano
Merge
bra
n
ch
'
jl/main
t
-
s
ubmodule-gitfile
-
awarenes
s
'
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Te
a
ch diff --submodule and st
a
tus to han
d
l
e
.
git files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C
H
amano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehm
a
nn
L
et check_preimage() use mems
e
t()
t
o in
i
tialize "
s
truct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Haman
o
Merge
b
ranch '
e
f/m
a
int-
e
mpt
y
-commit-log
'
into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ha
m
ano
Merge bran
c
h 'jc/confli
c
t-marker-size'
into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
M
er
g
e branch 'sp/maint
-
http-backend-die
-
triggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio
C Hamano
Merge branc
h
'mg
/
maint-send-email
-
laz
y
-editor' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ha
m
ano
M
erge br
a
nch 'rr
/
imap-send-unconfuse-fro
m
-lin
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Jun
i
o C
Haman
o
Merge br
a
n
ch 'rb/mai
n
t-p
y
thon
-
pa
t
h
'
int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2010-04-10
Junio C
H
a
mano
Merg
e
b
r
a
nch
'
gh/maint-
s
tash
-
sh
o
w-error-m
e
ss
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
i
o
C Hama
n
o
Merge branch 'mg/mai
l
map-
u
pdate' into maint
commit
|
commitdiff
|
tree
2010-04-10
Jun
i
o C
Hamano
Merge branch
'
bc
/
maint-d
a
e
mo
n
-sans-ss-family' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Tay R
a
y Chuan
fetch/p
u
sh:
fix u
s
age s
t
rings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio
C Hamano
Merge
b
ran
c
h 'rc/maint-reflog-ms
g
-f
o
r-forc
e
d-bra
n
c
h'
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray Chu
a
n
branch: say "Reset to" in
reflo
g
entries f
o
r 'gi
t
b
ranch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-09
J
unio
C
Hama
n
o
Mer
g
e
early
parts of jk/ca
c
h
e
d-textcon
v
commit
|
commitdiff
|
tree
2010-04-09
Junio C Hamano
diff
.
c
:
work
around
pointer
c
o
nstness
warning
s
commit
|
commitdiff
|
tree
2010-04-09
Junio
C
H
amano
Merge
b
r
a
nch
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-04-08
Jeff
King
doc
s
:
c
lar
i
fy "
b
ranch -l
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Junio C
H
a
m
ano
Submitti
n
gPatches: up
d
ate G
M
ail sec
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Junio C Hamano
Merge branc
h
'mg/notes-refl
o
g'
commit
|
commitdiff
|
tree
2010-04-07
Junio C Hamano
Merge
b
ranch 'jn/mailinfo-scissors'
commit
|
commitdiff
|
tree
2010-04-07
Jeff King
fix
typos and g
r
ammar in
1
.
7
.
1
draft re
l
e
ase
n
otes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Brandon Casey
notes
.
h:
declare
b
i
t field as uns
i
gned to s
i
len
c
e c
o
mpiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Ha
m
ano
Gi
t
1
.
7
.
1-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
M
erge branch 'd
a
/maint-python-star
t
up'
commit
|
commitdiff
|
tree
2010-04-06
Junio
C
Hamano
Mer
g
e branch
'
ic/bash-completion-
r
pm'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
M
e
r
ge
b
ranch 'sb/fmt-m
e
rge-msg'
commit
|
commitdiff
|
tree
2010-04-06
Junio C H
a
mano
Merge branch '
j
c/
c
onflict-mark
e
r
-
size'
commit
|
commitdiff
|
tree
2010-04-06
Junio
C
H
amano
Merge bran
c
h
'ef/ma
i
nt
-
empty-commit-log'
commit
|
commitdiff
|
tree
2010-04-06
Juni
o
C Ha
m
ano
Merge branch 'sg/bas
h
-
c
om
p
l
e
tion'
commit
|
commitdiff
|
tree
2010-04-05
Ju
n
io C Hamano
Rev
e
rt "Li
n
k
against libiconv on
I
R
IX"
commit
|
commitdiff
|
tree
2010-04-04
Junio C
H
am
a
n
o
Merge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-04-04
Tay
R
ay Chuan
pac
k
-protoc
o
l
.
txt: fix
pkt-line lengths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Chuan
pac
k
-protocol
.
t
xt
:
fix spell
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonath
a
n N
i
eder
Teach
mailin
f
o %< as an altern
a
tive sci
s
s
ors mark
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C
Hamano
Merg
e
branch 'mb/rebase-i
-
no-ff'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch
'sp
/
maint
-
http-backend-die-triggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Merge branch 'rr/imap-send
-
unc
o
nfuse
-
from-lin
e
'
commit
|
commitdiff
|
tree
next