repo.or.cz
/
alt-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 D/F conflicts
2010-07-09
El
i
jah Newren
merge-recursive: Fix D/F
conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Alexander Glad
y
s
h
Add a rename
+
D/
F
conf
l
ict testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elija
h
Newren
Ad
d
additional te
s
tcases for D/F conf
l
i
cts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
J
u
nio C Hamano
Git 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
Juni
o
C H
a
mano
Me
r
ge b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2010-04-23
E
ric
Raymond
Do
c
umentat
i
on im
p
rov
e
ments for the desc
r
i
ption of sho
r
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Junio C
H
a
ma
n
o
Sync
w
i
t
h
1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Junio C
Ham
a
no
Git
1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Merge
b
r
a
nch
'
mg/us
e
-
default-abbrev-length-in-rev-l
i
st
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
Ju
n
io C Hamano
Merge branch 'wp/doc-filter-directio
n
' into m
a
int
commit
|
commitdiff
|
tree
2010-04-23
Junio C
H
am
a
no
Merge bran
c
h 'jk
/
maint-d
i
f
f
s
t
at-
o
ver
f
low' into ma
i
nt
commit
|
commitdiff
|
tree
2010-04-23
J
unio C Ham
a
no
Merge branch 'da/main
t
-python-startup' into maint
commit
|
commitdiff
|
tree
2010-04-22
Junio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nieder
D
o
c
umentation/
M
a
kefile: fix
i
nterrupted b
u
ilds of us
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
Junio
C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-04-20
Mic
h
ael J G
r
u
b
er
t7012: Mar
k
missi
n
g
te
s
t
s as TODO
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
SZ
E
DER Gábor
reflog:
r
emove 'show' from '
e
xpi
r
e's us
a
ge string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge br
a
nch 'maint-1
.
6
.
6'
int
o
m
aint
commit
|
commitdiff
|
tree
2010-04-19
J
o
hanne
s
Sixt
MSVC: Fix
b
u
i
ld by
a
dding 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
Junio
C Ha
m
a
n
o
Merg
e
branch
'rr
/
remo
t
e-helper-doc
'
commit
|
commitdiff
|
tree
2010-04-19
Ju
n
io C H
a
mano
Merge branch 'wp/doc-filter-dire
c
tion'
commit
|
commitdiff
|
tree
2010-04-19
Juni
o
C
Ha
m
an
o
Merge br
a
n
c
h
'jk/maint-dif
f
stat-overf
l
o
w'
commit
|
commitdiff
|
tree
2010-04-19
Junio C
H
a
m
ano
Merg
e
branc
h
'jg/aut
o
-initiali
z
e-notes-with-pe
r
cent
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2010-04-19
Junio C
H
amano
Merge g
i
t:/
/
gi
t
.
kernel
.
org/
p
ub
/
scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramacha
n
dra
D
o
cume
n
tation/r
e
mote-helpers: Fix typos and improve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ra
m
k
u
m
ar
R
a
macha
n
dra
Fixup: Sec
o
n
d argument may be any arb
i
trary string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ra
m
achandr
a
Docum
e
ntatio
n
/rem
o
te-helpers: Add in
v
ocation section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
R
a
mkumar Ramachandra
Do
c
ument
a
tion/urls: Rewrite to
acc
o
modat
e
<transport
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramachandra
Documentation
/
rem
o
t
e-helper
s
: Rewri
t
e description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
Documentati
o
n: Describe other situations wh
e
re
-
z affec
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Jeff King
rebas
e
-int
e
ractive
:
s
i
l
e
nc
e
w
arning wh
e
n
no commits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
J
u
n
io C
Hamano
t
3
301: add
tes
t
s t
o
u
s
e
--format=
"
%N"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Junio C
Ham
a
n
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-04-17
Matthew Ogi
l
vie
t6006: do not
w
rite
t
o /tmp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Ch
r
is We
b
b
git-instaw
e
b: pa
s
s
th
r
ough inv
o
king user's path
to
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Junio C
H
amano
gitweb: simplify gitwe
b
.
m
in
.
* generat
i
on and c
l
ean
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
t
a
g
-
v: use RU
N
_GIT_
C
MD
t
o run
v
erify-tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Will Pal
m
er
d
o
cumentati
o
n: clarify direct
i
on of co
r
e
.
autocrlf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jeff King
di
f
f
: u
s
e
large integer
s
for d
i
ff
s
tat ca
l
cul
a
tion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
M
i
chael
J
Gru
b
er
t1010-mk
t
ree: Adjust expected result to code and
d
ocu
m
entation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Thoma
s
Rast
combined
diff: c
o
rrect
l
y handle truncated fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan Nieder
Document new "already
-
merged"
rule f
o
r
b
ra
n
c
h -d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
Niede
r
Add
.
depend directo
r
ies to
.
gitign
o
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-14
Junio C Hamano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-04-14
Joha
n
nes Gilg
e
r
pretty
:
I
nitialize notes i
f
%N is
u
sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jay
S
offian
Documenta
t
ion/co
n
fig
.
tx
t
: def
a
ult
g
c
.
ag
g
r
e
ssive
W
in
d
o
w
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-12
Marc
B
r
a
nchaud
D
ocs:
A
dd -X option to
git-merg
e
'
s syn
o
p
sis
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io
C
Hamano
M
e
rge branch 'jl/maint-su
b
m
o
dule-
g
itfile-awareness'
commit
|
commitdiff
|
tree
2010-04-11
Jo
h
anne
s
Sixt
W
i
ndows: star
t
_co
m
mand: Support non
-
NULL dir in
s
truct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Junio C
H
amano
Sync w
i
t
h
1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Junio C
H
a
m
a
no
Merge branch 'jc/doc-su
b
mit-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 branch 'rc/maint-refl
o
g-
m
s
g-for
-
forced-branch
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
Junio C
Hamano
blame d
o
c
u
men
t
ation: -M/-C notic
e
c
opied li
n
es a
s
well
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
St
e
p
h
en Boyd
t3507: Make test exe
c
utable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ham
a
no
Git 1
.
7
.
1
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge branch 'mr/gitweb-jsmin'
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io C Hamano
Merge
branc
h
'jl/maint-submodule-git
f
ile-aw
a
rene
s
s'
commit
|
commitdiff
|
tree
2010-04-10
Jens L
e
hmann
Teach
diff -
-
submodule and status to hand
l
e
.
git files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
J
uni
o
C Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Let
c
h
eck_preimage() use memset() to initializ
e
"stru
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hama
n
o
Merg
e
branch '
e
f
/
maint
-
e
mpt
y
-
c
o
m
mit-log' i
n
to
maint
commit
|
commitdiff
|
tree
2010-04-10
J
u
nio C Ha
m
an
o
M
e
rg
e
branc
h
'jc/conflict-m
a
rker-size' into main
t
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
i
o C Ham
a
no
M
e
rge branch 'sp/ma
i
n
t
-htt
p
-backend-die-triggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
J
un
i
o C Hamano
Mer
g
e b
r
anch 'mg/
m
a
int-s
e
nd-email-lazy-e
d
itor' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
Hamano
Merge branch
'
rr/ima
p
-s
e
nd-unconfuse-f
r
om-line' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Mer
g
e
b
r
a
nc
h
'rb/
m
a
i
n
t
-
p
ython-path' into maint
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C Hamano
Merge branch 'gh/
m
aint-st
a
sh-show-e
r
ror-message' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ha
m
a
no
Merge branch '
m
g
/
m
ailmap
-
update
'
into m
a
int
commit
|
commitdiff
|
tree
2010-04-10
J
u
nio C
H
amano
Merge branch 'bc/maint-daemon-sans-ss-family' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray Chuan
fetch/push: fix u
s
a
g
e st
r
i
n
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
M
e
rge branch 'rc/maint-ref
l
og-msg-f
o
r-forced-branch'
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray C
h
uan
b
r
anch: say "Reset to" in reflog entries f
o
r
'git bra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-09
Jun
i
o C Haman
o
Me
r
ge early pa
r
ts of jk/c
a
ched-te
x
tc
o
nv
commit
|
commitdiff
|
tree
2010-04-09
J
u
nio
C H
a
mano
diff
.
c: work
a
r
ound
pointer constness wa
r
nings
commit
|
commitdiff
|
tree
2010-04-09
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-04-08
J
ef
f
King
d
ocs:
c
larify
"bra
n
c
h
-l"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Junio C
H
amano
S
ubmit
t
i
ngPatc
h
es: up
d
ate GM
a
il section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Junio
C
H
a
mano
Merge
b
ranch
'
mg/note
s
-reflog'
commit
|
commitdiff
|
tree
2010-04-07
Junio C Hamano
Me
r
ge
b
ranch
'
jn/ma
i
li
n
fo
-
scissors'
commit
|
commitdiff
|
tree
2010-04-07
Jeff Kin
g
fix typo
s
and grammar in 1
.
7
.
1 draft
release
n
ote
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Bra
n
d
o
n Casey
not
e
s
.
h:
decla
r
e bit
f
ield as
u
nsigned to silence compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Junio
C Hamano
Git
1
.
7
.
1-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Jun
i
o C Hamano
Merge br
a
n
c
h 'da/maint-python-startup
'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge branch 'ic/bash-completion-rpm'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge
bra
n
ch 's
b
/
f
m
t-mer
g
e
-msg'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Haman
o
Merge branch 'j
c
/confl
i
ct-mark
e
r-size'
commit
|
commitdiff
|
tree
2010-04-06
Juni
o
C Hamano
Merge bran
c
h
'ef/maint
-
em
p
ty-co
m
mit-log'
commit
|
commitdiff
|
tree
2010-04-06
J
unio C Hamano
Merge branch 'sg/bash-comp
l
etion'
commit
|
commitdiff
|
tree
2010-04-05
J
u
nio C Hamano
Revert "Link against l
i
bi
c
onv on IRI
X
"
commit
|
commitdiff
|
tree
2010-04-04
Junio C Ham
a
no
Merge
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2010-04-04
T
a
y Ray Chuan
pac
k
-prot
o
co
l
.
txt:
f
ix pkt-line
l
en
g
ths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Chuan
pack-protocol
.
t
xt: fix spe
l
ling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
Teach mailinfo %<
as an
a
ltern
a
t
i
ve scissors mar
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Hamano
Merge branch 'mb/r
e
base-i-n
o
-ff'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o
C
Haman
o
M
e
rge branch '
s
p/main
t
-
ht
t
p
-backen
d
-die
-
triggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C Hamano
Merge branch 'r
r
/imap-sen
d
-unconfuse-from-line
'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Ha
m
ano
Merge bran
c
h 'mg/use-d
e
fault-abb
r
ev-length
-
in-rev-list'
commit
|
commitdiff
|
tree
next