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-import: Improve robustness when D->F changes provided in wrong order
2010-07-09
Eli
j
ah Newren
f
ast-import
:
I
m
prove robustness
w
hen D->F chan
g
es prov
i
d
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah N
e
wre
n
f
a
st-export:
Fix o
u
tput order
of D/F change
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
j
ah
N
ewren
m
e
rge_recursive:
F
ix renames
a
cross paths below D/F
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merge-recurs
i
v
e
: Fi
x
D/F conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
A
lexander Glad
y
sh
Add a rename +
D
/F co
n
flict testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
E
lijah Ne
w
ren
A
d
d a
d
ditional testcases f
o
r D/F confli
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
Juni
o
C Hamano
Git 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
Junio C Ha
m
ano
M
e
rge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-04-23
E
ric Raymond
Documentation i
m
pro
v
e
m
ents for
t
he descripti
o
n
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 with 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
J
u
nio C H
a
mano
Git 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Junio
C
Hamano
Merge br
a
n
ch 'm
g
/us
e
-default-abbrev-len
g
th-in-rev
-
list
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
J
unio C H
a
man
o
Merge b
r
a
nch 'wp/doc-filter-direction' into main
t
commit
|
commitdiff
|
tree
2010-04-23
J
u
nio C Hamano
M
e
rge
b
ranch 'jk/maint-diffstat-o
v
erflow' into m
a
int
commit
|
commitdiff
|
tree
2010-04-23
Ju
n
i
o C
Hamano
Merge branch 'da
/
mai
n
t-py
t
h
o
n-startup' into maint
commit
|
commitdiff
|
tree
2010-04-22
Junio C
H
amano
Me
r
ge
b
ran
c
h 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-04-22
Jonath
a
n Ni
e
de
r
Doc
u
men
t
ation/Makefil
e
: fix i
n
t
e
r
rupted builds of user
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
Junio
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-20
Michael J Grub
e
r
t7012: Mark
mis
s
ing tests as TODO
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
SZEDER Gábor
refl
o
g: remo
v
e 'show' from 'expire's u
s
a
ge string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Juni
o
C Hamano
Merge
branch 'maint
-
1
.
6
.
6' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-04-19
Johannes
Sixt
M
S
VC: Fix build by
adding missing termio
s
.
h
dummy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
G
it 1
.
7
.
1-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
J
u
nio C Hamano
Merge branch 'rr/remote-helper-doc'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Haman
o
Merge branch 'wp/doc-f
i
lter-
d
i
r
ection'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge br
a
n
c
h 'jk/main
t
-di
f
fstat-
o
ve
r
flow'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge branch '
j
g
/
a
u
to-
i
nitial
i
ze
-
notes-
w
ith-
p
ercent
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Junio C
H
am
a
no
Me
r
ge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-04-19
Junio C
Hamano
Mer
g
e gi
t
://git
.
ke
r
ne
l
.
org/pub/scm
/
gitk/
g
itk
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramachandr
a
Docume
n
t
a
tion/remote-helpers: Fix typ
o
s and improve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramacha
n
dra
Fixup: Secon
d
a
rgument may be any arbitrary
s
tring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ram
k
umar
Ram
a
ch
a
ndra
D
ocumentatio
n
/
r
e
mote
-
h
e
lpe
r
s: Add invoca
t
ion secti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramac
h
andra
Do
c
umentat
i
on/urls:
R
ewr
i
te to
accomodate <transport
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
R
a
mku
m
ar Ra
m
achan
d
ra
Documentation/remote-helpers: Re
w
rite des
c
ri
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Documentati
o
n
:
Describe other s
i
t
u
at
i
ons wher
e
-z
affects
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Jeff King
reb
a
se-interactive:
s
ilence wa
r
ning when no commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Junio C H
a
mano
t3301: add
tests to u
s
e --fo
r
mat="%N"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Ju
n
io C Hamano
Merge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2010-04-17
Mat
t
h
ew
Ogilvie
t6006
:
do not write
to /t
m
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Chris
Webb
g
it-in
s
taweb: pass through invoking user's path to
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hama
n
o
gitweb: simpl
i
fy gitweb
.
min
.
* genera
t
ion and clean
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
ta
g
-
v
: u
s
e RUN_GIT_CMD to run verify-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
W
ill Palmer
docum
e
ntatio
n
:
clarify direction of core
.
autocrl
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Jeff King
diff: use large integers for diff
s
tat calculations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
M
i
chael J Gru
b
e
r
t1010-mkt
r
ee: Adjust expected resul
t
to code and documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Thomas Ra
s
t
c
o
mbined d
i
ff: co
r
re
c
tly ha
n
dle
t
ru
n
cated fi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
D
o
cumen
t
new "alr
e
ad
y
-merged" rule for branch -d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
Nieder
Ad
d
.
depe
n
d d
i
re
c
tories to
.
gitignore
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
Johannes Gilger
p
retty: Ini
t
ialize notes if %N i
s
used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-13
Jay
Sof
f
ian
Docum
e
ntation/con
f
ig
.
txt: default gc
.
aggres
s
iv
e
Window
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-12
Marc Branchaud
Docs: Add -X op
t
ion
t
o gi
t
-merge'
s
synop
s
is
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Junio C
H
a
m
ano
M
erge
bran
c
h 'jl/m
a
int-submo
d
ule-gitfile-awarene
s
s'
commit
|
commitdiff
|
tree
2010-04-11
J
ohan
n
es Sixt
Windows: start_co
m
ma
n
d
:
S
upport n
o
n
-
NUL
L
d
ir
in struct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io
C Hamano
Sync
with
1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io
C Hamano
Merge branch
'
j
c
/do
c
-submit-gmail'
commit
|
commitdiff
|
tree
2010-04-11
Junio
C
Ham
a
n
o
Gi
t
1
.
7
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Junio
C
Hamano
M
e
rge branc
h
'
rc/maint-reflo
g
-msg-for-forced-b
r
anc
h
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
Juni
o
C Hama
n
o
blame
d
ocumentation: -M/-C no
t
ice copied lines as well
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Steph
e
n
Boyd
t3507
:
M
a
k
e
tes
t
exe
c
u
t
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
Hamano
G
it 1
.
7
.
1-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io C Hamano
Me
r
ge branc
h
'
mr/gitweb
-
j
s
min'
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
Hamano
Mer
g
e bra
n
c
h
'jl/main
t
-submodule-g
i
tf
i
l
e
-
a
wareness'
commit
|
commitdiff
|
tree
2010-04-10
J
e
n
s
L
ehma
n
n
T
e
ach diff --s
u
bmo
d
ule a
n
d
status to handle
.
git fil
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
Ha
m
a
no
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-04-10
J
ens Lehmann
L
et check
_
preimage()
use memset() to ini
t
ialize
"
struc
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C H
a
m
ano
Merge branch 'e
f
/
m
aint-empty-commit-log' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C Hamano
Merge branch
'jc/con
f
l
ict-marker-si
z
e' into main
t
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge br
a
nch 'sp/maint-http-backend-
d
ie-triggers-
d
ie
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C
H
ama
n
o
Merge b
r
anch 'mg/maint-send-email-lazy-editor' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge branch 'rr/imap-send-unconfuse-from-line
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Mer
g
e branch '
r
b/maint-python-path' int
o
maint
commit
|
commitdiff
|
tree
2010-04-10
Jun
i
o
C
H
ama
n
o
Merge bra
n
ch 'gh/maint-s
t
ash
-
sh
o
w
-error-message' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C Hama
n
o
Merge
b
r
anch 'mg/mailmap-update' int
o
maint
commit
|
commitdiff
|
tree
2010-04-10
J
unio C H
a
mano
Merg
e
branch 'bc/maint-daemon-sans-ss-fa
m
i
l
y' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray
C
huan
fetch/push: fix u
s
age
s
trings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ha
m
ano
Mer
g
e branc
h
'rc/maint-r
e
flog-msg-for-
f
orced-
b
ranch'
commit
|
commitdiff
|
tree
2010-04-10
Ta
y
Ray C
h
uan
branc
h
: s
a
y "Re
s
e
t t
o
"
in
reflo
g
entri
e
s for 'git
b
ran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-09
J
un
i
o C Hamano
Mer
g
e e
a
rly parts of jk/cache
d
-text
c
onv
commit
|
commitdiff
|
tree
2010-04-09
Ju
n
i
o
C
Ham
a
no
diff
.
c: wo
r
k aro
u
nd
pointer
c
onstness warni
n
gs
commit
|
commitdiff
|
tree
2010-04-09
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-08
Jeff King
docs:
c
larify "branch -l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Ju
n
io C Hamano
S
u
bmitting
P
atches: update G
M
ail sect
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
J
u
n
io
C Hamano
M
erge br
a
nch 'mg/notes-re
f
l
og'
commit
|
commitdiff
|
tree
2010-04-07
Junio C H
a
mano
Merge b
r
a
n
ch 'jn/maili
n
fo-scissors'
commit
|
commitdiff
|
tree
2010-04-07
Jeff Ki
n
g
fix typo
s
and gr
a
mmar in
1
.
7
.
1 draft r
e
lease notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Brandon Casey
no
t
es
.
h: declare
b
it fie
l
d
as unsigned to
sil
e
nce co
m
piler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Git
1
.
7
.
1-
r
c0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
Jun
i
o
C
Hamano
Merge
branc
h
'da/maint
-
p
y
thon-s
t
artup'
commit
|
commitdiff
|
tree
2010-04-06
Ju
n
io
C Hamano
Merge branch 'ic/bash-completion
-
rpm'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Ham
a
n
o
Merge
b
ranch 'sb/fmt-m
e
rge-
m
sg'
commit
|
commitdiff
|
tree
2010-04-06
Junio C
H
amano
Merge branch 'j
c
/confli
c
t
-
marker-s
i
ze'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge bran
c
h 'ef/ma
i
nt-em
p
t
y-com
m
it-l
o
g'
commit
|
commitdiff
|
tree
2010-04-06
Junio C
Hamano
Merge branch 'sg/bash-com
p
letion'
commit
|
commitdiff
|
tree
2010-04-05
Ju
n
io C Ha
m
ano
Revert "Link against li
b
iconv
o
n
IRIX"
commit
|
commitdiff
|
tree
2010-04-04
J
u
nio
C Hamano
Merge br
a
n
c
h
'
maint
'
commit
|
commitdiff
|
tree
2010-04-04
T
ay Ray Chuan
pack-prot
o
col
.
txt: fix
pk
t
-lin
e
lengt
h
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Tay
R
ay Chuan
pa
c
k-p
r
otoc
o
l
.
txt: fix sp
e
lling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan N
i
ede
r
Te
a
ch mail
i
n
f
o %<
a
s an alternative scissors mark
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Ha
m
ano
Merge branch 'mb/rebase-i-n
o
-f
f
'
commit
|
commitdiff
|
tree
next