index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
pull.c
Age
Commit message (
Expand
)
Author
Files
Lines
2017-06-13
Merge branch 'nd/fopen-errors'
Junio C Hamano
1
-2
/
+1
2017-06-05
Merge branch 'tb/pull-ff-rebase-autostash'
Junio C Hamano
1
-11
/
+14
2017-06-01
pull: ff --rebase --autostash works in dirty repo
Tyler Brazier
1
-11
/
+14
2017-05-26
use xfopen() in more places
Nguyễn Thái Ngọc Duy
1
-2
/
+1
2017-05-08
merge: convert checkout_fast_forward to struct object_id
brian m. carlson
1
-2
/
+2
2017-05-08
Convert lookup_commit* to struct object_id
brian m. carlson
1
-5
/
+5
2017-04-26
Merge branch 'jk/war-on-git-path'
Junio C Hamano
1
-2
/
+2
2017-04-20
use git_path_* helper functions
Jeff King
1
-2
/
+2
2017-03-31
Rename sha1_array to oid_array
brian m. carlson
1
-3
/
+3
2017-03-31
Make sha1_array_append take a struct object_id *
brian m. carlson
1
-1
/
+1
2017-03-28
sha1-array: convert internal storage for struct sha1_array to object_id
brian m. carlson
1
-11
/
+11
2017-03-28
builtin/pull: convert to struct object_id
brian m. carlson
1
-36
/
+36
2017-03-26
builtin/pull: convert portions to struct object_id
brian m. carlson
1
-3
/
+3
2016-12-19
Merge branch 'jc/pull-rebase-ff'
Junio C Hamano
1
-4
/
+18
2016-11-29
pull: fast-forward "pull --rebase=true"
Junio C Hamano
1
-4
/
+18
2016-10-07
wt-status: teach has_{unstaged,uncommitted}_changes() about submodules
Johannes Schindelin
1
-1
/
+1
2016-10-07
wt-status: make the require_clean_work_tree() function reusable
Johannes Schindelin
1
-76
/
+1
2016-10-07
pull: make code more similar to the shell script again
Johannes Schindelin
1
-10
/
+20
2016-10-07
pull: drop confusing prefix parameter of die_on_unclean_work_tree()
Johannes Schindelin
1
-8
/
+8
2016-07-13
Merge branch 'va/i18n-even-more'
Junio C Hamano
1
-1
/
+1
2016-06-17
i18n: advice: internationalize message for conflicts
Vasco Almeida
1
-1
/
+1
2016-05-20
pull: warn on --verify-signatures with --rebase
Alexander Hirsch
1
-0
/
+3
2016-05-17
Merge branch 'va/i18n-misc-updates'
Junio C Hamano
1
-7
/
+7
2016-04-29
Merge branch 'jc/merge-refuse-new-root'
Junio C Hamano
1
-0
/
+6
2016-04-21
pull: pass --allow-unrelated-histories to "git merge"
Junio C Hamano
1
-0
/
+6
2016-04-19
i18n: builtin/pull.c: split strings marked for translation
Vasco Almeida
1
-4
/
+4
2016-04-19
i18n: builtin/pull.c: mark placeholders for translation
Vasco Almeida
1
-3
/
+3
2016-03-21
pull --rebase: add --[no-]autostash flag
Mehul Jain
1
-0
/
+12
2016-03-21
git-pull.c: introduce git_pull_config()
Mehul Jain
1
-3
/
+15
2016-01-28
Merge branch 'jc/strbuf-getline'
Junio C Hamano
1
-1
/
+1
2016-01-26
Merge branch 'js/pull-rebase-i'
Junio C Hamano
1
-2
/
+7
2016-01-15
strbuf: introduce strbuf_getline_{lf,nul}()
Junio C Hamano
1
-1
/
+1
2016-01-13
pull: allow interactive rebase with --rebase=interactive
Johannes Schindelin
1
-2
/
+7
2015-12-16
submodules: allow parallel fetching, add tests and documentation
Stefan Beller
1
-0
/
+6
2015-11-20
Remove get_object_hash.
brian m. carlson
1
-1
/
+1
2015-11-20
Convert struct object to object_id
brian m. carlson
1
-1
/
+1
2015-10-16
Merge branch 'pt/pull-builtin' into maint
Junio C Hamano
1
-1
/
+1
2015-10-16
pull: enclose <options> in brackets in the usage string
Alex Henrie
1
-1
/
+1
2015-09-11
pull: don't mark values for option "rebase" for translation
Ralf Thielow
1
-1
/
+1
2015-08-25
Merge branch 'mh/tempfile'
Junio C Hamano
1
-0
/
+1
2015-07-22
pull: allow dirty tree when rebase.autostash enabled
Kevin Daudt
1
-1
/
+5
2015-06-18
pull: remove redirection to git-pull.sh
Paul Tan
1
-7
/
+0
2015-06-18
pull --rebase: error on no merge candidate cases
Paul Tan
1
-3
/
+12
2015-06-18
pull --rebase: exit early when the working directory is dirty
Paul Tan
1
-1
/
+76
2015-06-18
pull: configure --rebase via branch.<name>.rebase or pull.rebase
Paul Tan
1
-1
/
+34
2015-06-18
pull: teach git pull about --rebase
Paul Tan
1
-2
/
+245
2015-06-18
pull: set reflog message
Paul Tan
1
-0
/
+22
2015-06-18
pull: implement pulling into an unborn branch
Paul Tan
1
-1
/
+28
2015-06-18
pull: fast-forward working tree if head is updated
Paul Tan
1
-0
/
+30
2015-06-18
pull: check if in unresolved merge state
Paul Tan
1
-0
/
+9
[next]