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
merge_recursive: Fix renames across paths below D/F conflicts
2010-07-09
El
i
jah
Newren
mer
g
e
_
recursiv
e
: Fix r
e
n
a
mes across p
a
t
h
s below D/F
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merg
e
-recursive: Fix D/F conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Alexander Gladysh
Add a
rename + D/F
c
onflict testcas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Ne
w
ren
A
d
d a
d
ditional
testcases for
D/F
c
onflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
Junio 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
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2010-04-23
Eri
c
R
a
ymond
Documentation improvements for
t
h
e description 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
Junio C Haman
o
Git 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Merge bra
n
c
h 'mg/use-defaul
t
-abb
r
ev-length-in-rev-l
i
st
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
J
u
nio C
Hama
n
o
Me
r
ge bra
n
ch 'wp/doc-fil
t
er
-
direction' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-04-23
Juni
o
C Haman
o
Merge branch 'j
k
/
m
a
int-diffs
t
at-over
f
low'
into maint
commit
|
commitdiff
|
tree
2010-04-23
Juni
o
C
Hamano
M
e
r
ge branch 'da/maint-python-start
u
p' int
o
m
aint
commit
|
commitdiff
|
tree
2010-04-22
Juni
o
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nieder
Document
a
tion/Mak
e
file: fix inte
r
r
up
t
ed bui
l
ds of user
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
Junio C Hamano
Me
r
ge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2010-04-20
M
i
c
hael J Grub
e
r
t7012: Mark
missing tests as TODO
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
SZEDER Gábor
r
e
flog: r
e
move 'show' from 'expire's
usa
g
e strin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o C Hamano
Merge branch 'maint-1
.
6
.
6' into
mai
n
t
commit
|
commitdiff
|
tree
2010-04-19
Joh
a
nnes
S
i
xt
MSVC: Fix bui
l
d
b
y
a
dding m
i
ss
i
ng termios
.
h
d
ummy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
J
unio
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
Merge branch
'rr/remote-
h
elp
e
r-doc'
commit
|
commitdiff
|
tree
2010-04-19
J
u
n
io C H
a
mano
Merge br
a
nch
'wp/d
o
c-filter-direction'
commit
|
commitdiff
|
tree
2010-04-19
J
u
n
io C Hamano
M
e
rge branch 'jk/
m
ain
t
-diff
s
tat-ove
r
flow'
commit
|
commitdiff
|
tree
2010-04-19
Juni
o
C Haman
o
Merge branch 'jg/auto-
i
nitialize
-
notes-with-
p
er
c
ent
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Junio C H
a
m
a
no
Merg
e
branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-04-19
J
u
n
io C Hamano
Merge git://git
.
kernel
.
org/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar
Ramachandr
a
Documentat
i
on/remote-helpe
r
s: Fix typos and improve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar R
a
mach
a
ndra
Fix
u
p: Se
c
ond ar
g
u
ment
may be any arbi
t
rary
s
tring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramachandra
Documentation/remote-helpers
:
Add invocation
se
c
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar
Ramachandra
Docume
n
tatio
n
/urls: Rewrite t
o
accomodate
<tr
a
nsport
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ram
k
umar Ramachandra
D
o
c
umentation/
r
emote-helpe
r
s: Rewrite description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Charles Baile
y
Document
a
t
i
on:
Des
c
ribe other
s
i
tuations where
-z affects
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Jeff King
rebase-interactive: silence warning
when no
c
ommits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Jun
i
o C Hamano
t
3301: add
t
e
sts t
o
use --format="%N"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-17
M
a
tthew Ogil
v
i
e
t6006: do not
write
to /tmp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Chris Web
b
git-
i
nstaweb: pass
throug
h
invoking user's path to
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Junio
C
H
amano
gitweb:
simplify gitweb
.
min
.
*
ge
n
erat
i
on and clean
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonath
a
n Nied
e
r
ta
g
-v: use RUN_
G
I
T_CMD t
o
run
v
erif
y
-
t
ag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Will
Pal
m
er
d
o
cum
e
ntat
i
o
n:
clarify direction of core
.
autocr
l
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Jeff
K
i
n
g
diff: use large integ
e
r
s
f
or diffs
t
a
t calculations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Mic
h
ael J Gruber
t
1
010-mktree: A
d
just expected result t
o
code
and d
o
cumentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Thomas Rast
combined dif
f
: correctly handle truncat
e
d file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Document
n
ew
"
al
r
eady-merged"
r
ule
for branch -d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan Ni
e
d
er
A
dd
.
depend di
r
ectories to
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-14
Junio C
Hama
n
o
Mer
g
e bra
n
ch
'm
a
int'
commit
|
commitdiff
|
tree
2010-04-14
Johannes Gilger
pre
t
t
y: Initialize notes if %N is used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-13
Jay So
f
f
ian
Documentat
i
on/config
.
txt: default gc
.
ag
g
r
e
ssiveWin
d
ow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-12
Marc
B
r
a
nch
a
ud
Doc
s
: Add
-
X
o
p
tion t
o
git-merge's synopsis
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
Me
r
ge branch 'jl/maint-s
u
bmod
u
l
e-gitfil
e
-aw
a
reness'
commit
|
commitdiff
|
tree
2010-04-11
Johannes Sixt
Wi
n
d
ows:
start_command
:
S
u
pport n
o
n-NULL dir in struct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Jun
i
o C Hamano
Sync with 1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io C
H
amano
Merge branch
'jc/doc-submit-
g
m
ail'
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
J
unio C
Ham
a
n
o
M
erge
branch 'rc
/
main
t
-
reflog-msg-for-forced
-
branch
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
Jun
i
o C Hamano
blam
e
documentati
o
n: -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
S
t
ephen Boyd
t35
0
7: M
a
ke te
s
t exe
c
utable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C
H
aman
o
G
it 1
.
7
.
1
-
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ham
a
no
Me
r
ge branch 'm
r
/gi
t
we
b
-jsmin'
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C Hamano
M
erge b
r
anch 'jl/maint-submodule-gitfile-
a
wareness'
commit
|
commitdiff
|
tree
2010-04-10
Jens
L
ehmann
Teach di
f
f --submodule and st
a
tu
s
to handle
.
git files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
J
u
ni
o
C
Hamano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehm
a
n
n
Let
c
he
c
k
_prei
m
a
g
e
(
) use
m
e
mset() t
o
i
n
i
tialize "struct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
J
unio C Hamano
Merge b
r
anc
h
'ef/maint-empty-commit-log' i
n
to maint
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
Hama
n
o
Merge
branch
'
jc/conflict-marker-size'
into maint
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
i
o C Hamano
Mer
g
e branch 'sp/maint-http-backe
n
d-d
i
e-t
r
iggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C H
a
mano
M
erge
branch
'mg/maint-send-em
a
il-l
a
zy-edito
r
' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C
H
a
m
ano
Merge
branch 'r
r
/imap-send-unconfuse-from-
l
i
ne' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio
C Hama
n
o
Merge branc
h
'rb/
m
aint-pyth
o
n-path'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io C Hamano
Merge branch 'g
h
/main
t
-stash-sh
o
w-err
o
r
-message' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Jun
i
o C
Hamano
M
e
r
g
e
bra
n
c
h 'mg/mailmap-update'
into maint
commit
|
commitdiff
|
tree
2010-04-10
J
u
nio C Ham
a
no
Merge branch
'bc/maint
-
daemon
-
sans-ss-fa
m
ily' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
T
a
y Ray C
h
u
an
f
etch/push:
f
ix usage s
t
ring
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge branc
h
'rc/maint-
r
eflog-ms
g
-for-forced
-
branch'
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray Chu
a
n
bran
c
h: s
a
y
"R
e
set to
"
in
r
eflog entries for 'git branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-09
J
uni
o
C Ham
a
no
Merge
early
parts of
jk/cached-text
c
on
v
commit
|
commitdiff
|
tree
2010-04-09
Junio C Hamano
diff
.
c
:
work a
r
ound pointer co
n
stness war
n
in
g
s
commit
|
commitdiff
|
tree
2010-04-09
J
u
nio C Hamano
Merg
e
bra
n
ch
'main
t
'
commit
|
commitdiff
|
tree
2010-04-08
Jeff Ki
n
g
docs: clarify "branch -l
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Jun
i
o C Hamano
S
ubmittingPa
t
ches
:
upda
t
e GMail s
e
cti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Jun
i
o C Hamano
Merge branc
h
'mg/note
s
-
reflo
g
'
commit
|
commitdiff
|
tree
2010-04-07
Junio C Hamano
Merge branch 'jn/mailinfo-scissors'
commit
|
commitdiff
|
tree
2010-04-07
Je
f
f Kin
g
fix ty
p
o
s
a
nd gra
m
mar in
1
.
7
.
1 draft release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Brandon
C
a
se
y
no
t
es
.
h
:
declare bit fie
l
d as
unsigned to sil
e
nce compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Ha
m
ano
Git 1
.
7
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Ham
a
n
o
M
erge branch 'd
a
/maint-python-startup'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Mer
g
e b
r
anch 'ic/ba
s
h-completio
n
-rpm'
commit
|
commitdiff
|
tree
2010-04-06
Junio
C Hamano
Merge branch 'sb
/
f
m
t-merge-m
s
g'
commit
|
commitdiff
|
tree
2010-04-06
Junio
C
H
amano
Merge bra
n
ch '
j
c/conflict-marker-size'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merg
e
b
r
a
n
ch
'ef/maint-empty-commi
t
-log'
commit
|
commitdiff
|
tree
2010-04-06
J
unio C Hamano
Merge
b
ranc
h
'sg/bash-compl
e
tion'
commit
|
commitdiff
|
tree
2010-04-05
J
u
nio C Hamano
R
evert "Link agai
n
st l
i
biconv on
IRIX
"
commit
|
commitdiff
|
tree
2010-04-04
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-04
Tay
Ray Chuan
p
ack-protocol
.
txt: fix p
k
t-lin
e
l
e
ngths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ra
y
Chuan
pack-protocol
.
txt: fix
spelling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
J
onathan Nied
e
r
T
each mailinfo %< as an alternative
s
c
iss
o
rs mark
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Hamano
Merg
e
b
r
a
nch
'mb
/
rebase-i
-
n
o
-
f
f'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
rge b
r
anc
h
'sp/maint-h
t
tp-
b
a
c
kend-die-triggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Haman
o
Merge b
r
anch 'rr/imap-send-unconfuse-from-l
i
n
e'
commit
|
commitdiff
|
tree
next