repo.or.cz
/
git
/
jnareb-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-export: Fix output order of D/F c
h
a
n
g
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h Newren
merge_rec
u
r
sive: Fix
r
e
n
ames ac
r
o
s
s paths below D/F
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah New
r
en
merge-
r
e
cur
s
ive: Fix
D/F confl
i
cts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Alex
a
nder Glad
y
sh
Add a ren
a
me + D/F conflict testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
El
i
jah
N
e
w
ren
Ad
d
add
i
tional testcases for
D/F conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
Jun
i
o C Hamano
Git 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
Junio C Hama
n
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-04-23
Eric
R
aymond
Docum
e
ntation im
p
rove
m
ents for
t
h
e
des
c
r
i
ption o
f
short
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
J
u
n
io C H
a
mano
Syn
c
with 1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Git
1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
J
unio
C
H
a
mano
M
erge
b
ranch 'mg/use-de
f
au
l
t-a
b
b
rev-l
e
ngth-in-rev
-
list
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Merge branch 'wp/doc-filt
e
r-directi
o
n'
into m
a
int
commit
|
commitdiff
|
tree
2010-04-23
Junio C
Hamano
M
erg
e
b
ranch 'j
k
/maint-
d
iffs
t
at-ove
r
flow' into m
a
int
commit
|
commitdiff
|
tree
2010-04-23
Junio C Ham
a
no
Merge branch 'da/maint-python-startup' into ma
i
nt
commit
|
commitdiff
|
tree
2010-04-22
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nieder
Documentation/Makefile: fix i
n
t
err
u
pted builds of user
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
Junio C Hamano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-04-20
M
ichael J Gruber
t7012: Mark
missing
tests as TODO
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
SZEDE
R
Gá
b
or
reflog: remove 's
h
ow'
from 'e
x
pir
e
's usa
g
e string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
J
unio C
Hamano
Merge br
a
nch
'maint-1
.
6
.
6' into m
a
i
nt
commit
|
commitdiff
|
tree
2010-04-19
J
o
hann
e
s
Si
x
t
MSVC: Fix build by
a
ddi
n
g
mi
s
sing termios
.
h dummy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o
C
Hamano
Git 1
.
7
.
1-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merg
e
bra
n
c
h
'rr/remote
-
hel
p
er-d
o
c'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge branch 'wp/doc-filter-d
i
rec
t
ion'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge branch 'jk/maint-diffstat-overflo
w
'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hama
n
o
M
erge branch 'jg/auto-ini
t
ialize-notes-with-
p
ercent
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Junio
C
H
amano
Mer
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2010-04-19
J
u
nio
C
Hamano
Merge git://git
.
kern
e
l
.
org/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2010-04-18
R
a
m
kumar Ramac
h
andra
Documenta
t
ion/remote-helpers
:
F
ix typos
and
improve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar
Ramachandra
Fixu
p
: Second argum
e
nt may be an
y
a
r
bitrary string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ram
k
umar
R
a
machandra
Docum
e
ntat
i
on/remote-helpers: Add invocation section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ram
k
umar Ramachandra
Doc
u
mentation/
u
rls: Rewrite to accomodate <tr
a
nsp
o
rt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ramku
m
ar
R
amachandra
Documentat
i
on/rem
o
te
-
helpers: Rewrite descri
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles Bailey
Docu
m
entation:
D
es
c
ribe ot
h
e
r
situations
w
here -z affe
c
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Jef
f
Kin
g
rebase-interactive: silence
warni
n
g when no commits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Junio C Ham
a
no
t3301:
a
d
d tests to use --format="%N"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Junio
C
H
amano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-04-17
M
a
tthew Ogi
l
vie
t6
0
0
6
:
d
o
not write to /tm
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Chris Webb
git-inst
a
web: pass thr
o
ugh invokin
g
u
s
er's path
to
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hamano
gitweb
:
simp
l
i
fy gi
t
web
.
min
.
* generat
i
on and clean
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jona
t
han Ni
e
der
t
a
g -v: use RUN_GIT_CMD to run ve
r
if
y
-
tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
W
ill Palmer
documen
t
ation: clarify direction o
f
core
.
au
t
ocrlf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jeff King
diff: use
large
integers f
o
r
di
f
fstat
c
alculations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Michael J Gruber
t
1010-mktree: Adj
u
st exp
e
cted result to c
o
de and
d
ocumentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Thomas Rast
combined dif
f
: cor
r
ectly handle
tr
u
ncated fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nied
e
r
Docume
n
t
new "already-mer
g
ed"
r
ule
for branch -d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Add
.
d
epend direc
t
orie
s
to
.
g
i
ti
g
no
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-14
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-14
Johann
e
s
G
ilger
pretty: Initialize n
o
tes if %N is used
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-13
J
a
y
Soffi
a
n
Documentatio
n
/
c
on
f
ig
.
txt: default g
c
.
a
ggres
s
iveWindow
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-12
M
arc Bran
c
h
aud
D
ocs: Ad
d
-
X
option to git-mer
g
e's synop
s
is
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
M
e
rg
e
branch 'jl/m
a
int-submod
u
l
e
-gitfile-aw
a
r
e
n
e
ss'
commit
|
commitdiff
|
tree
2010-04-11
Jo
h
ann
e
s
S
i
x
t
Win
d
ows: start_c
o
mma
n
d: Support
non-NULL dir in stru
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Junio C Ha
m
ano
S
y
n
c with 1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
Merge b
r
anch 'jc/
d
oc-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
Juni
o
C Haman
o
Merge branc
h
'rc/maint-re
f
log-msg-for-f
o
r
c
ed-branch
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
Jun
i
o C Haman
o
blame documentation: -M/-C notice copi
e
d
lin
e
s as well
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Stephen Boyd
t3507: Make test executable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C H
a
mano
Gi
t
1
.
7
.
1-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
J
unio C
H
amano
Merge branch 'mr/gitweb-jsmin'
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C Hamano
Merge bra
n
c
h
'jl/maint-submodul
e
-gitfile-awareness'
commit
|
commitdiff
|
tree
2010-04-10
J
e
ns Lehmann
Tea
c
h diff --submo
d
ule and statu
s
to handle
.
git files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Le
t
che
c
k
_
p
r
eimag
e
()
u
se memset
(
) to init
i
alize
"st
r
uct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
M
e
rge branch 'ef/maint-empty-commit-log' into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge branch '
j
c/conf
l
ict-marker-size'
into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ham
a
no
Merge b
r
a
n
ch 'sp/maint-htt
p
-backend
-
die-trigg
e
rs-
d
ie
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
M
erge branch 'mg/m
a
int-
s
end
-
email-
l
azy-editor' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
Haman
o
Merge
branch 'rr/imap-
s
e
nd-
u
nconfuse-from
-
line' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
J
unio
C
Hamano
Merge bra
n
ch 'rb
/
main
t
-
p
ython-path' in
t
o
main
t
commit
|
commitdiff
|
tree
2010-04-10
J
u
nio C Hamano
Merge
b
r
anch 'gh/
m
aint-s
t
ash
-
show-error-message'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C
H
a
m
ano
Merge branch
'
mg
/
m
ailmap-
u
pdat
e
' into maint
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io C Ham
a
no
Merge branch 'bc/maint-daemon
-
s
a
n
s
-ss-
f
ami
l
y' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Ta
y
Ray C
h
uan
fet
c
h/push: fi
x
usage strin
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
J
unio C Hamano
Merge
b
r
a
nch 'rc
/
m
a
int-reflo
g
-ms
g
-for-
f
orce
d
-
br
a
n
ch'
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray Chuan
b
r
anch: say "Reset to" in reflog entries for 'git
branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-09
Juni
o
C
Hamano
Merg
e
e
a
rly pa
r
t
s
of jk
/
c
ached-textconv
commit
|
commitdiff
|
tree
2010-04-09
Junio C Ha
m
ano
diff
.
c: wo
r
k around pointer constn
e
s
s wa
r
nings
commit
|
commitdiff
|
tree
2010-04-09
Junio C H
a
m
ano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-04-08
Jeff Kin
g
docs: cl
a
r
ify "bra
n
ch -l"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Junio C Hamano
Submit
t
ingPatches: upda
t
e
GMail sectio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Jun
i
o C Haman
o
M
e
rge bran
c
h 'mg/notes-reflog
'
commit
|
commitdiff
|
tree
2010-04-07
J
u
nio C Hamano
Merge bran
c
h 'jn/mailinfo-
s
cisso
r
s'
commit
|
commitdiff
|
tree
2010-04-07
Jeff King
fix ty
p
os an
d
grammar
i
n 1
.
7
.
1
draft re
l
ease
notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Brandon Cas
e
y
not
e
s
.
h: declare bit field
as u
n
signed
to s
i
l
e
n
c
e
compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Ham
a
no
G
it
1
.
7
.
1
-
rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Ham
a
no
Merge branch 'd
a
/main
t
-python-startup'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
M
erg
e
branch 'ic/bash-com
p
letion
-
r
p
m'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Ham
a
no
Merge
branch 'sb/fmt-merge
-
msg'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge branch 'jc/con
f
lict-ma
r
ker-size
'
commit
|
commitdiff
|
tree
2010-04-06
Ju
n
io C Haman
o
Merge b
r
anch
'
ef/ma
i
nt-empty-commit-log'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge branch '
s
g/bash-completion'
commit
|
commitdiff
|
tree
2010-04-05
Junio
C
Hamano
Revert "Link against li
b
iconv on IRIX"
commit
|
commitdiff
|
tree
2010-04-04
Junio
C
Ham
a
n
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-04-04
T
a
y Ray C
h
uan
pack-proto
c
ol
.
txt: fix
pkt-line lengths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Ch
u
an
pack-proto
c
ol
.
txt: fix spelling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
J
o
nathan Nied
e
r
Teach m
a
i
l
info %
<
a
s
an alternative scissors mark
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Ham
a
no
M
e
rge branch 'mb/re
b
a
s
e-i-no-ff'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch
'sp/maint-http-b
a
c
k
end-die-triggers-die
.
.
.
commit
|
commitdiff
|
tree
next