repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fc/rerere-conflict-style' into maint
2014-06-25
Ju
n
io
C Hamano
Merge bran
c
h
'fc/re
r
ere-co
n
flict-style' into mai
n
t
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Mer
g
e branc
h
'rs/pack-obj
e
cts-no-unnecessary-
r
e
a
ll
o
c
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Me
r
ge branch 'dt
/
m
e
rge
-
recursive-case-insensitive
'
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge
b
ranch 'rs/mailinf
o
-
h
eader-cmp' into mai
n
t
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Me
r
ge branch 'jk/ind
e
x-pac
k
-r
e
port-missing' i
n
t
o main
t
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio C Hamano
Merge branch 'nd/
i
n
dex-pack-one-fd-per-thread' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
H
a
mano
Mer
g
e branch 'sk/spawn
-
less-case-
i
nsensitively-from
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io C Ha
m
an
o
M
erge branc
h
'nd/daemon
i
z
e-gc' into m
a
i
nt
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io C H
a
m
a
no
Merge branch '
j
k/diff-follow-
m
ust-take-one
-
p
ath
s
pec
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge
b
ranch 'jk/diff-files-
a
s
s
ume-unchang
e
d
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge bran
c
h 'jk/commi
t
-C-pick-empt
y
' into
main
t
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge bran
c
h 'bc/blame-crlf-test'
i
n
to maint
commit
|
commitdiff
|
tree
2014-06-25
Jun
i
o C
Hamano
Me
r
ge branch '
j
x/blame-al
i
gn-relati
v
e-t
i
me' into mai
n
t
commit
|
commitdiff
|
tree
2014-06-25
Junio C Haman
o
Merg
e
br
a
nch 'j
c
/a
p
ply-ignore-whitespace'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2014-06-25
J
u
n
io C Hama
n
o
Merge branch
'jk/compl
e
t
e
-merge-pu
l
l' into maint
commit
|
commitdiff
|
tree
2014-06-25
Jun
i
o
C Hamano
Merge bran
c
h
'ow/config-
m
ailmap-pathname' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge branch 'as/pr
e
t
t
y-truncate'
i
nto
m
ain
t
commit
|
commitdiff
|
tree
2014-06-25
Junio
C H
a
man
o
Merge branch 'jc/revis
i
on-dash-count-pars
i
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C
Hamano
Merge branch 'jk/report-fail-t
o
-read-o
b
ject
s
-better
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
J
un
i
o C Hamano
Mer
g
e branc
h
'mn/sideband-n
o
-ansi' into main
t
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge
bra
n
ch 'je/pager-do-not-recurse' into maint
commit
|
commitdiff
|
tree
2014-06-12
Junio
C Hamano
Merge
b
ranc
h
'jc/rev
-
parse-
a
rgh-dashed-multi-words
.
.
.
commit
|
commitdiff
|
tree
2014-06-12
Jace
k
Konieczny
pull: do not
a
buse '
b
r
e
a
k
' inside
a
shel
l
'case'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-09
Junio C
H
amano
revisio
n
: parse "g
i
t l
o
g
-<count>" more care
f
u
l
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-04
Jeff King
update-ind
e
x: fix segfault with
m
i
s
s
i
ng --
c
acheinfo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
René S
c
harfe
pac
k
-objects:
u
se fre
e
()+xcalloc()
i
nstead of xrealloc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
René Scha
r
fe
m
ailinfo: use strcmp()
f
o
r
string compari
s
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
Mich
a
el Na
u
m
ov
sideband
.
c: do not use ANSI con
t
rol se
q
uence on non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-30
Junio C Hamano
Sync with 1
.
9
.
4
commit
|
commitdiff
|
tree
2014-05-30
Jun
i
o C Hamano
Gi
t
1
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-30
J
e
ff
King
t553
7
: re-drop
h
t
tp tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-28
Jun
i
o C H
a
mano
Merge branch
'
rh/prom
p
t-pcmode
-
avoid-eval-on-refname
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Junio
C
H
amano
Merge branch
'
mw/symlinks
'
int
o
maint
commit
|
commitdiff
|
tree
2014-05-28
Junio
C Ha
m
ano
Git 2
.
0
commit
|
commitdiff
|
tree
2014-05-27
Øy
s
te
i
n
W
alle
co
n
f
i
g: respect '~' and '~us
e
r
' in mailmap
.
fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
N
g
uyễn Thái Ngọc Duy
gc --auto: do
not loc
k
refs in the back
g
round
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completion: add
m
issing
o
ptions f
o
r git-me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
J
o
hn
Keeping
comp
l
etion:
a
dd a note that
merge options are shar
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
J
u
nio C Hamano
Update dr
a
ft re
l
ease notes to 2
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
A
lexey Shum
k
in
prett
y
.
c: form
a
t string w
i
th tr
u
ncate respects
l
o
gOutp
u
t
Enc
o
ding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alex
e
y Sh
u
m
k
in
t4
2
05, t6006:
a
dd
t
e
s
ts that
fail with i1
8
n
.
log
O
utput
E
ncodi
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alexe
y
S
h
umkin
t4
2
05
(
log-pr
e
t
ty-format
)
: use `tfor
m
a
t
` rather than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shu
m
k
i
n
t40
4
1, t4205, t
6
0
0
6, t7102: don
'
t
ha
r
dcode t
e
sted
encoding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Junio C
H
amano
Git 2
.
0-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Jason St
.
John
RelNotes/2
.
0
.
0
.
t
xt:
F
ix seve
r
al grammar issues, not
a
bly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
J
uni
o
C Hamano
R
e
vert "Merge branch '
j
c/graduate-remote-hg-bzr' (early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
J
e
ff King
move "--fol
l
ow
nee
d
s
o
ne pat
h
spec" rule t
o
diff_setup_done
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hamano
Merge br
a
nch
'jc/graduate-remote-hg-bzr' (ear
l
y part)
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hamano
r
em
o
te-helpers: point at t
h
eir
u
pstre
a
m
repositor
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Fe
l
ipe Contreras
c
o
ntrib: r
e
m
ote
-
helper
s
:
a
d
d mo
v
e warnings (v2
.
0)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Junio
C
H
amano
Revert "Merge branch 'fc/transport-helper-sync-err
o
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
Junio C H
a
mano
M
e
rge branch 'r
h
/prompt-pcm
o
de-
a
v
oid
-
eval-on-refname'
commit
|
commitdiff
|
tree
2014-05-19
R
i
c
hard
Hanse
n
git-prompt
.
sh:
don't assume
t
h
e
shell expands the value
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
Alexey
S
humkin
t4205 (log-pretty-formats):
don't hardcode
SHA-1 in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
J
u
nio C Hamano
Merge branch '
l
t/req
u
est-pull'
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
Merg
e
branch 'jl/use-vsatisfy-correctly-for-2
.
0'
commit
|
commitdiff
|
tree
2014-05-19
J
u
nio C Hamano
Mer
g
e
g
it
:
//github
.
com/git-l10n/gi
t
-po
commit
|
commitdiff
|
tree
2014-05-19
J
unio
C Hamano
Merge branch 'k
b
/fast-hashma
p
'
commit
|
commitdiff
|
tree
2014-05-19
A
nders Ka
s
eorg
Documenta
t
ion/technical/ap
i
-hashmap: rem
o
ve so
u
rc
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
J
ens Lehmann
g
i
t-gui
:
tolera
t
e major
v
ersio
n
ch
a
nges whe
n
com
p
a
r
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-16
J
unio
C
Hamano
re
q
uest-
p
ull: resurr
e
ct fo
r
-linus -> t
a
gs/for-linus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Johann
e
s Schindel
i
n
git gr
e
p -O -i: if the pager is 'les
s
', pass the '
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Jeff King
o
p
en_sha1_file: re
p
ort "most interesting" errno
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Jeff
King
run_diff_files:
d
o n
o
t look at uninit
i
a
lized sta
t
da
t
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-13
Junio C Hamano
Merg
e
b
ranch 'fc/prompt-zsh-re
a
d
-f
r
o
m
-fi
l
e'
commit
|
commitdiff
|
tree
2014-05-13
Feli
p
e
Contreras
contrib: completion:
f
ix 'erea
d
()'
n
a
m
espace
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-12
Jeff King
i
n
dex-pack: distinguish missing o
b
jects from ty
p
e errors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-12
Jun
i
o C Ham
a
n
o
Merge g
i
t
://github
.
com/git-l1
0
n/git-
p
o
commit
|
commitdiff
|
tree
2014-05-09
Junio C Hamano
G
it
2
.
0-rc3
commit
|
commitdiff
|
tree
2014-05-09
Junio C
Hamano
Sync with 1
.
9
.
3
commit
|
commitdiff
|
tree
2014-05-09
Ju
n
io C Hama
n
o
Git 1
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
brian m
.
carlson
blame:
c
o
rrectly
han
d
l
e
files reg
a
r
d
less of
a
utoc
r
l
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
David Tu
r
ner
mv: al
l
ow renam
i
n
g to fix case on case i
n
sensitive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
Juni
o
C Hamano
Sync
w
ith maint
commit
|
commitdiff
|
tree
2014-05-08
J
o
nathan Nieder
shell doc: remove stra
y
"
+
"
in e
x
ample
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
Jun
i
o
C
Hamano
Merge git:/
/
gi
t
hu
b
.
com/gi
t
-
l
10n/git-po
commit
|
commitdiff
|
tree
2014-05-08
Juni
o
C Hamano
Start
p
reparing for 1
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
J
u
ni
o
C
Hama
n
o
M
e
rge b
r
anch 'cl/p4-use-diff-tree' into m
a
int
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge branch 'rh/prompt-pcmode-av
o
i
d
-ev
a
l-o
n
-refn
a
m
e
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C Ha
m
ano
Merge branch 'km/avoid-non-fun
c
tion-return-i
n
-rebase
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Ju
n
io
C H
a
m
ano
Merge
b
ra
n
ch 'tb/unicode-6
.
3-zero-width' into ma
i
nt
commit
|
commitdiff
|
tree
2014-05-08
Jun
i
o C Ham
a
no
Merge b
r
an
c
h 'km
/
avo
i
d-bs-in
-
shell-g
l
ob' into maint
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Mer
g
e branch 'km/
a
v
oid-cp-
a
' into m
a
int
commit
|
commitdiff
|
tree
2014-05-07
Junio C Ham
a
no
U
p
date dra
f
t relea
s
e notes fo
r
2
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Junio C Hamano
M
e
r
ge bra
n
ch
'
c
l/p4-use-
d
iff-tree'
commit
|
commitdiff
|
tree
2014-05-07
David Turner
mer
g
e-re
c
urs
i
ve
.
c: fix case-c
h
anging merge bu
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
T
o
lga Ceylan
git-p4
:
format-patch to diff-tree cha
n
ge breaks bina
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Øyvind A
.
Holm
RelNotes/2
.
0
.
0: G
r
ammar and t
y
po fix
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-02
Junio C
Hama
n
o
Git
2
.
0-rc2
commit
|
commitdiff
|
tree
2014-05-02
Junio C H
a
m
ano
Mer
g
e branch 'm
w
/sym
l
inks'
commit
|
commitdiff
|
tree
2014-05-02
Junio C Hamano
Merge branch 'k
m
/gi
t
-svn
-
workaround
-
older-getopt-l
o
ng'
commit
|
commitdiff
|
tree
2014-05-02
J
unio C Hamano
Me
r
ge branch 'rh/p
r
om
p
t-pcmode-a
v
o
id
-
eval-on-refname'
commit
|
commitdiff
|
tree
2014-05-02
Ju
n
io C Ham
a
no
Merge branch 'mk/doc-git-gu
i
-display
-
untracke
d
'
commit
|
commitdiff
|
tree
2014-04-30
Junio C Hamano
Me
r
ge git://github
.
com/git-l10n
/
git-po
commit
|
commitdiff
|
tree
2014-04-30
Junio C Hamano
Revert
the wh
o
le "
a
sk
cu
r
l-c
o
nfig" topic for now
commit
|
commitdiff
|
tree
2014-04-30
Felipe Contreras
rerere:
f
ix for merge
.
conflictstyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-28
Jörn E
n
g
e
l
p
a
g
er: do allow spawning
p
ager recursively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-28
Junio
C
Hamano
Merge
b
r
a
nch 'db/make-with-cur
l
'
commit
|
commitdiff
|
tree
2014-04-28
Junio
C
Hamano
Merge br
a
nch 'jk/ex
t
e
r
nal-diff-us
e
-argv-array' (early
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Dave Borowitz
Makefile: default to -lcurl
when no CURL
_
CONFIG or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next