repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fast-export: Fix output order of D/F changes
2010-07-09
Elijah Newren
fast-expor
t
: Fix
o
utput order of D/F
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merge_recursi
v
e: Fix
r
e
n
ame
s
across
p
ath
s
below D/F
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
E
lij
a
h N
e
wre
n
merge-recursiv
e
:
Fix D/F confli
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Al
e
xander Glady
s
h
Add a rename + D/
F
conflict testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
Add additional testcas
e
s for D/F conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
Junio C Hama
n
o
G
i
t
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
Ju
n
i
o C H
a
m
a
no
M
erge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-04-23
Eric Raymond
Documentation im
p
rovem
e
nts for th
e
des
c
ription
of short
.
.
.
the bug noted by
Junio C Hamano
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
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
Hama
n
o
Git 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hama
n
o
Mer
g
e
bra
n
c
h
'mg/us
e
-def
a
u
lt-abbrev
-
le
n
gth-in-rev-list
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Merge branch 'wp/doc-f
i
lter-dire
c
tio
n
'
into m
a
int
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Merge branc
h
'j
k
/maint-diffstat-overflow'
into maint
commit
|
commitdiff
|
tree
2010-04-23
Jun
i
o C Hamano
Merge
b
ra
n
ch 'da/maint-python-start
u
p
'
i
nto maint
commit
|
commitdiff
|
tree
2010-04-22
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-22
Jonathan N
i
eder
Documentation/Makefile: fix i
n
terrupted builds of user
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
Ju
n
io C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-04-20
Mi
c
hael J
Gruber
t
7
012: Mark missing te
s
ts
as TOD
O
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
SZEDER Gábo
r
reflog:
r
emov
e
'show'
f
rom 'expire'
s
usage string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Junio C
Hamano
Merge branc
h
'
maint-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-04-19
Johannes Sixt
MSVC: Fi
x
b
uild by adding
missing termios
.
h dummy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
G
i
t 1
.
7
.
1-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Junio C
H
aman
o
Merge branch 'rr/remote-h
e
l
p
er-doc'
commit
|
commitdiff
|
tree
2010-04-19
Junio C
Ha
m
ano
Mer
g
e branch
'w
p
/doc
-
filter-direction'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
M
e
rg
e
bran
c
h 'jk/m
a
i
n
t-dif
f
stat-ov
e
r
flow
'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge branch 'jg/auto-initi
a
lize
-
n
ot
e
s
-
with-percent
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o C H
a
mano
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hama
n
o
Merge git://gi
t
.
ker
n
el
.
org/pu
b
/scm/gitk/g
i
t
k
commit
|
commitdiff
|
tree
2010-04-18
Ram
k
umar Ramachandra
Do
c
umentation/re
m
ote-hel
p
er
s
: Fix typos
and i
m
prov
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramachandra
Fixup: Seco
n
d
a
r
gumen
t
may be any arbitrary strin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
R
amkumar Ramach
a
ndra
Do
c
um
e
ntation/rem
o
te
-
hel
p
e
rs: Add invocatio
n
s
e
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar
Ramachandr
a
Docume
n
t
ation/url
s
: Rewrite
t
o
accomodate <tran
s
p
ort
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ram
k
umar
Ramacha
n
dra
Do
c
umentation/remot
e
-helpers: Rewrite de
s
crip
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
Documentation: Describe other s
i
t
ua
t
ions where -z affects
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Je
f
f King
rebas
e
-interactiv
e
: silence warning when
no c
o
mmits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Junio
C
Hamano
t3301: ad
d
tests to use
--format="%N"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Junio C
H
a
mano
M
erge
b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2010-04-17
Mat
t
he
w
Ogilvi
e
t
60
0
6: d
o
not w
r
ite to /tmp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Chris W
e
bb
git-instaweb: pas
s
t
h
rough
i
n
v
o
k
i
ng user's path to
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hamano
gitweb: simplify gitweb
.
mi
n
.
* generati
o
n and clean
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Niede
r
t
a
g
-
v: use RUN_GIT_CMD t
o
run verify-ta
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Will P
a
lmer
d
o
cumentation: c
l
arify direction
of core
.
autocrl
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Jef
f
King
d
iff: use large integers for
d
if
f
stat ca
l
culations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Michael J Gru
b
er
t
1
010-mktree: Adjust expecte
d
resu
l
t to code and d
o
c
u
mentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Th
o
mas Rast
combined diff: correct
l
y
ha
n
dl
e
truncate
d
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Document new "already-merged" rule for br
a
nch -d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Niede
r
A
d
d
.
dep
e
nd direc
t
ories to
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-14
Jun
i
o C
Hamano
Mer
g
e b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-04-14
Johan
n
es
G
ilger
pretty:
Initialize n
o
te
s
if %N i
s
used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-13
Jay Soffian
Do
c
umentation/confi
g
.
txt: default gc
.
aggres
s
iveWindow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-12
Marc Branchaud
Docs: Add -X option t
o
git-merge's
s
ynopsis
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
Merge
branch
'
j
l
/maint-
s
ubmodule-git
f
i
l
e-
a
wareness'
commit
|
commitdiff
|
tree
2010-04-11
Joha
n
nes Sixt
Windows: s
t
art_command: Su
p
po
r
t
n
on-NULL di
r
in
struct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
J
u
n
i
o C H
a
mano
Sync wit
h
1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
J
u
nio C H
a
m
an
o
Merge br
a
nch
'
jc/doc-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
Merge bran
c
h
'rc/ma
i
nt
-
r
e
f
log
-
msg-f
o
r-force
d
-branc
h
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
Junio C Ha
m
ano
blame
d
o
c
umentation
:
-M/-C not
i
ce
c
opie
d
lines as
w
e
ll
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Stephe
n
B
oyd
t3507
:
Make
test
e
xecutable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Jun
i
o
C Hamano
G
i
t 1
.
7
.
1-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hama
n
o
Merge branc
h
'mr/gi
t
w
e
b
-jsmin'
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ham
a
no
Merge br
a
nc
h
'jl/maint-s
u
bmodule-
g
i
t
f
i
le-
a
w
a
r
e
ness'
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Teach
d
iff -
-
submodule
a
n
d stat
u
s t
o
ha
n
dle
.
git
f
i
les
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C
Hamano
Merge
branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-04-10
Jens
Lehma
n
n
L
et check
_
preimage()
us
e
m
ems
e
t() to ini
t
ial
i
ze
"
st
r
uct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
M
e
r
ge
b
r
anch 'e
f
/maint-empty-commi
t
-log
'
into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Me
r
ge
b
ranc
h
'j
c
/
conflict
-
marker-size
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ha
m
a
no
Merge branch 'sp/m
a
i
n
t-http-
b
ackend-die-triggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ha
m
ano
Merge
branch 'mg/maint-s
e
nd-email-lazy-e
d
i
tor' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
H
a
mano
M
erge branch 'rr/imap-send-unconfus
e
-from-li
n
e'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io C Hamano
Merge branch 'rb/maint-python-path'
into
maint
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
H
a
mano
M
erge branch '
g
h/mai
n
t-st
a
s
h-show-erro
r
-message' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Haman
o
Merge b
r
anch
'
mg/mai
l
map-update' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ham
a
no
Me
r
ge b
r
anch 'bc/maint-daemon-sans-ss-famil
y
' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray
C
hu
a
n
fetch/push:
f
ix usag
e
s
trings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge
b
ranch 'rc/maint-reflog-m
s
g-for-for
c
ed-bra
n
ch'
commit
|
commitdiff
|
tree
2010-04-10
T
ay Ray Chuan
bran
c
h: say
"
Reset to" in reflog
e
ntries
for 'git branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-09
J
u
ni
o
C
H
a
mano
Merge early parts of jk/cached-textconv
commit
|
commitdiff
|
tree
2010-04-09
Jun
i
o C Hamano
d
i
ff
.
c: work a
r
oun
d
pointer
c
on
s
tnes
s
warni
n
g
s
commit
|
commitdiff
|
tree
2010-04-09
Junio C Hamano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-04-08
Jeff
Kin
g
docs: clarify
"
b
ran
c
h
-l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Junio C Hamano
S
ubmit
t
ingPatches: update GMail
s
e
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Junio C Hamano
Merge br
a
n
c
h
'mg/notes-reflog'
commit
|
commitdiff
|
tree
2010-04-07
J
u
nio C Hamano
Merge br
a
n
c
h 'jn/mailinf
o
-scissors'
commit
|
commitdiff
|
tree
2010-04-07
Jeff
King
f
i
x typos and grammar in 1
.
7
.
1
dra
f
t
release note
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
B
r
a
ndon Ca
s
ey
not
e
s
.
h
: declare bit field as unsigned to silen
c
e
comp
i
ler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
J
unio C Hamano
Git 1
.
7
.
1
-
rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Haman
o
Merge branch 'da
/
maint
-
pyth
o
n-star
t
up'
commit
|
commitdiff
|
tree
2010-04-06
Ju
n
i
o C
H
aman
o
Merge branch 'ic/bash-comple
t
i
o
n-r
p
m'
commit
|
commitdiff
|
tree
2010-04-06
Juni
o
C Ham
a
no
Merge branch 'sb/fmt-merge
-
msg'
commit
|
commitdiff
|
tree
2010-04-06
Junio C
Hamano
Merge branch
'
jc/
c
onflict-marker-si
z
e'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge b
r
anch
'ef
/
maint-empty-commit-log'
commit
|
commitdiff
|
tree
2010-04-06
J
u
nio
C Hamano
M
erge branch 'sg/bash-
c
o
m
ple
t
i
on'
commit
|
commitdiff
|
tree
2010-04-05
Junio C Hamano
Revert
"
Link ag
a
in
s
t libiconv
on IRIX"
commit
|
commitdiff
|
tree
2010-04-04
Junio C Haman
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-04-04
T
ay Ray Chuan
pack-pro
t
ocol
.
t
xt:
f
ix pkt-line lengths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray
C
h
u
a
n
pack
-
protocol
.
txt:
f
ix s
p
ell
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
J
onathan Ni
e
der
Teach mail
i
n
fo
%
< as an
al
t
ernativ
e
sci
s
s
o
rs mark
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
J
uni
o
C Hamano
Merg
e
branch 'mb/r
e
ba
s
e-i-no-ff'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
m
a
n
o
Merg
e
b
r
anch
'
sp/maint
-
htt
p
-bac
k
end-die-t
r
i
g
gers-die
.
.
.
commit
|
commitdiff
|
tree
next