repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
notes: extract enum notes_merge_strategy to notes-utils.h
2015-08-17
Jacob
K
elle
r
n
o
te
s
: ext
r
act enum notes_merge
_
s
trategy
to n
o
tes-u
t
ils
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-08-17
Jacob Keller
notes: document cat_sort_un
i
q rewr
i
teMode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o
C
Hamano
Git 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ham
a
no
Sync wi
t
h
2
.
4
.
7
commit
|
commitdiff
|
tree
2015-07-27
J
u
nio C Haman
o
Git 2
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Merge bra
n
ch '
j
k/p
r
etty-encod
i
ng-doc' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Merge bran
c
h 'tb/ch
e
ckout
-
doc'
i
nto main
t
commit
|
commitdiff
|
tree
2015-07-27
J
unio C Hamano
Merge
branch 'ls/
h
i
n
t
-
r
e
v-list-count' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
a
m
a
no
M
e
rge branch 'mm/branch-d
o
c-updat
e
s' into m
a
int
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hamano
Me
r
ge branch
'
jc/fsck-retire-require-eoh' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Junio
C Ha
m
a
no
Me
r
ge branch 'et/h
t
tp-p
r
oxyauth' in
t
o m
a
i
nt
commit
|
commitdiff
|
tree
2015-07-27
Junio C Ha
m
a
no
Me
r
ge branch 'jc/unexport-g
i
t-
p
ager-in-use-
i
n
-pager
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C Hama
n
o
M
erge branch '
m
h
/
strbuf-r
e
ad-file-returns-ssize-t'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
H
a
mano
Merge branch 'kb/con
f
ig-unmap-befor
e
-renaming' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o
C
H
a
m
ano
Merg
e
branch 'jk/rev-list-no-b
i
tmap-wh
i
le-pruning'
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Jun
i
o C
Hamano
Merg
e
branch 'rh/test-co
l
or-av
o
id-terminfo-in-origin
a
l
.
.
.
commit
|
commitdiff
|
tree
2015-07-27
Junio C
Hamano
Merge branch 'jk/fix-refresh-utime'
i
nto
maint
commit
|
commitdiff
|
tree
2015-07-27
Juni
o
C Hamano
Merge branch 'cb
/
r
e
ba
s
e-am-exit-code' into maint
commit
|
commitdiff
|
tree
2015-07-27
Junio
C
Hamano
Merge branc
h
'jk/inde
x
-pack-reduce-rechec
k
' into maint
commit
|
commitdiff
|
tree
2015-07-24
Junio C Hamano
RelN
o
tes: am
.
thre
e
Way doe
s
n
o
t exist
(
ye
t
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-24
Junio
C
Hamano
Revert "gi
t
-am: add a
m
.
threeWay config variable"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Hama
n
o
Git 2
.
5
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-21
Junio C Ham
a
no
Merge br
a
nch
'
t
f/gitweb-typo
f
ix'
commit
|
commitdiff
|
tree
2015-07-21
Junio C Hama
n
o
Merge tag 'l10n
-
2
.
5
.
0-rnd2' of g
i
t:
/
/gi
t
h
ub
.
c
om/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-17
Junio
C
Hamano
Merge branch '
j
k/still
-
i
n
t
e
rest
i
n
g
'
commit
|
commitdiff
|
tree
2015-07-17
Junio C Hamano
Merge branch
'es/
w
orktree-ad
d
'
commit
|
commitdiff
|
tree
2015-07-17
Eric Sunshine
D
o
c
u
mentation/git: fix stale "MU
L
TIPLE C
H
E
C
KOUT MODE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
J
unio C H
a
mano
workt
r
ee: caution that this
i
s stil
l
experimental
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-16
Eric Suns
h
ine
Documen
t
a
tion/git-w
o
rkt
r
ee: fix stale "git ch
e
ckout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Ju
n
io C Hamano
Sync with 2
.
4
.
6
commit
|
commitdiff
|
tree
2015-07-15
Junio
C Hamano
Gi
t
2
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Me
r
ge bran
c
h 'jc/diff-ws-error-
h
ighlight
'
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
M
e
rge
branch 'mm
/
describe-doc' int
o
m
aint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Mer
g
e b
r
anch 'jc/prom
p
t-documen
t
-ps1-state-separat
o
r
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Jun
i
o C
Hamano
Merge branch 'es/osx-hea
d
er-pol
l
ute
s
-mask-macro' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
J
u
n
io C
H
amano
Me
r
ge bra
n
ch 'es/utf8-
s
tupid-comp
i
ler
-
wo
r
karou
n
d' into
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge branch
'fk/doc-format-pat
c
h-
v
n' into maint
commit
|
commitdiff
|
tree
2015-07-15
J
unio C Hamano
Merge branch 'pt/t0302-n
e
eds-sanity' into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio
C Ha
m
ano
Merge br
a
nch
'
me/fetch-i
n
to-
s
hal
l
ow-sa
f
ety' i
n
to maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Mer
g
e bran
c
h 'mh/fsck-reflog-entries' i
n
to maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merge branch 'af/t
c
s
h-comple
t
ion-no
c
lobber' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-07-15
Junio
C
Hamano
Mer
g
e branch 'p
a
/
a
uto-
g
c-mac-osx' into maint
commit
|
commitdiff
|
tree
2015-07-15
Junio C Hamano
Merg
e
branch 'jc/do-not-
f
eed-tags-to-
c
lea
r
-comm
i
t-marks
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio
C Hamano
Merge tag 'l10n-2
.
5
.
0
-rn
d
1' o
f
git:
/
/github
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio
C
Hamano
Git
2
.
5
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-13
Junio
C
H
aman
o
Merge
b
ranch
'
es/worktree-a
d
d'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merg
e
branc
h
'nd/multipl
e
-work-trees'
commit
|
commitdiff
|
tree
2015-07-13
Juni
o
C H
a
ma
n
o
Merge
branch 'ss/clone-guess
-
dir-name-simplify'
commit
|
commitdiff
|
tree
2015-07-13
Junio C
H
a
mano
M
e
rge branch 'kb/confi
g
-unma
p
-
b
efore-renamin
g
'
commit
|
commitdiff
|
tree
2015-07-13
J
u
nio C Ham
a
no
M
e
rge b
r
anch 'mh/strbuf-read-file-
r
eturns-ssize-
t
'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge b
r
anch 'jc/unexport-git-p
a
g
er-in-use-in-
p
ager'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge branch 'kb/use-nsec-doc'
commit
|
commitdiff
|
tree
2015-07-13
Junio C Hamano
Merge branch 'j
s
/rebase-i-clean-up-upon-cont
i
n
u
e
-to
.
.
.
commit
|
commitdiff
|
tree
2015-07-13
Junio C Ha
m
ano
Merge bran
c
h 'et/http-pro
x
y
a
uth
'
commit
|
commitdiff
|
tree
2015-07-13
Junio C H
a
ma
n
o
Merge branch
'
jc/fsck-reti
r
e-require-eoh'
commit
|
commitdiff
|
tree
2015-07-12
René Sch
a
rfe
dif
f
: pars
e
ws-e
r
ror-hi
g
hlight
o
pt
i
on more strictly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-12
Junio C Hamano
Revert "c
h
eckout:
retir
e
--ignore
-
o
ther-worktre
e
s in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
The last m
i
nute bits
o
f fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-10
Junio C
H
a
m
an
o
Merge bran
c
h 'cb/r
e
bas
e
-am-exit-code'
commit
|
commitdiff
|
tree
2015-07-10
Junio C
H
ama
n
o
M
e
rge branch 'jk/fix-
r
efresh-utime
'
commit
|
commitdiff
|
tree
2015-07-10
Jun
i
o C Ham
a
no
Me
r
g
e
b
r
anch 'mm/branch-doc-update
s
'
commit
|
commitdiff
|
tree
2015-07-10
Junio
C Hamano
Merge branch 'ls/hint-re
v
-list
-
count'
commit
|
commitdiff
|
tree
2015-07-10
J
unio
C
Ha
m
ano
Merge branch 'j
k
/rev
-
list-no-bi
t
map-w
h
ile-pr
u
ning'
commit
|
commitdiff
|
tree
2015-07-10
J
u
ni
o
C Haman
o
Me
r
g
e
branch 'cb/subtr
e
e-tests-u
p
date'
commit
|
commitdiff
|
tree
2015-07-10
Ju
n
i
o
C Hamano
Me
r
g
e
b
ranch 'rh/test-color-avoid-term
i
n
fo-in-original
.
.
.
commit
|
commitdiff
|
tree
2015-07-10
Junio C Ham
a
no
Merge branch 'sb/p53
1
0-an
d
-ch
a
i
n'
commit
|
commitdiff
|
tree
2015-07-10
Junio C
Hamano
Mer
g
e
branch 'tb/checkout
-
d
oc'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Ham
a
n
o
Merge branch '
j
k
/
pretty-encoding-doc
'
commit
|
commitdiff
|
tree
2015-07-10
Junio C Hamano
Merg
e
b
r
anch 'nd/dwim-wildcards-as-p
a
thspecs'
commit
|
commitdiff
|
tree
2015-07-09
J
u
nio C Hamano
Merge bra
n
c
h
'
j
k/maint-for-e
a
ch-packed-object
'
commit
|
commitdiff
|
tree
2015-07-09
J
u
n
io C Hamano
M
er
g
e branch 'jc/fix-alloc-sortbuf-i
n
-index-pack'
commit
|
commitdiff
|
tree
2015-07-09
Seba
s
tia
n
Schub
e
rt
h
clone: simplify string hand
l
ing
in gu
e
ss_dir_name(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-08
Jeff King
c
h
eck_and_fr
e
sh
e
n_file
:
f
ix
rever
s
e
d success
-
ch
e
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-08
Clemens Buchacher
rebase:
re
t
urn non-zer
o
er
r
o
r
c
o
de if format-patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-07
E
ric S
u
nshine
chec
k
o
ut: retire --igno
r
e-other-workt
r
ees
in favor
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-07
Eric S
u
nshine
w
o
r
k
t
r
ee: add: auto-vivify new branch
w
hen <branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric
S
unshine
w
o
rktr
e
e: add: make -b/-B defa
u
lt to HEAD when <branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
w
orktree: ext
r
act
ba
s
ename computation to new function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ric
S
un
s
hine
c
h
eckout
:
r
equ
i
re worktree unconditionally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
checkout: retire
-
-to optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshine
test
s
: workt
r
e
e
: retrofit
"checkout --to" tests for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
r
ic
S
unshine
wo
r
ktree: add -b
/
-B o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c Sunshine
worktree: add --
d
e
tach op
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Suns
h
ine
worktree: add
-
-for
c
e option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric
S
unshine
worktree: introduce "a
d
d" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric
S
unshin
e
checkout:
drop
'checkout_opts'
d
ependency
f
rom prepare_linke
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ric Sunshine
ch
e
cko
u
t: make
-
-to unc
o
nd
i
tional
l
y verb
o
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ric
Sunshine
checkout:
p
repa
r
e_li
n
ked_che
c
k
out: drop now-unused
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eri
c
Sunshi
n
e
c
heckout: relocate -
-
t
o
's "no branch specified"
check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Suns
h
ine
checkout: fix bug w
i
th --to and
relative H
E
AD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
r
ic S
u
nshi
n
e
Documentation/git-
w
o
r
kt
r
ee: add EXAMPLES
s
ection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
r
ic
S
unshine
Doc
u
mentat
i
o
n/git-w
o
rktree
:
add high-level
'
lock' overvie
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric S
u
nshine
Documentation
/
git-wo
r
ktree: split te
c
hnical info
f
r
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Eric Sunshin
e
Documentation/gi
t
-worktree:
a
dd
B
UGS se
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Er
i
c Sunshine
D
o
c
ument
a
tion: mov
e
l
i
nked
w
orktr
e
e de
s
c
ri
p
tion from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ri
c
S
u
n
shine
D
o
c
u
me
n
tation
/
git-worktr
e
e:
a
s
s
o
c
iate optio
n
s wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
E
ric Sunshine
Documenta
t
ion/git-c
h
ecko
u
t: fi
x
in
c
orrect worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Matthieu
Moy
D
o
cumentat
i
on/branch: document -M and -
D
in terms of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Matthieu Moy
Docume
n
t
ation/bran
c
h: doc
u
ment -
d
-
-force and -m -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-07-06
Matthi
e
u
M
oy
git-multimail: upd
a
te to release 1
.
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next