summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ss/builtin-cleanup'Junio C Hamano2014-01-101-1/+5
|\
| * builtin/help.c: speed up is_git_command() by checking for builtin commands firstss/builtin-cleanupSebastian Schuberth2014-01-061-0/+3
| * builtin/help.c: call load_command_list() only when it is neededSebastian Schuberth2014-01-061-1/+2
* | Merge branch 'js/lift-parent-count-limit'Junio C Hamano2014-01-101-4/+4
|\ \
| * | Remove the line length limit for graft filesjs/lift-parent-count-limitJohannes Schindelin2013-12-271-4/+4
* | | Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano2014-01-101-6/+26
|\ \ \
| * | | merge-base --octopus: reduce the result from get_octopus_merge_bases()bm/merge-base-octopus-dedupJunio C Hamano2013-12-301-1/+1
| * | | merge-base: separate "--independent" codepath into its own helperJunio C Hamano2013-12-301-6/+25
* | | | Merge branch 'km/gc-eperm'Junio C Hamano2014-01-101-1/+1
|\ \ \ \
| * | | | gc: notice gc processes run by other userskm/gc-epermKyle J. McKay2014-01-021-1/+1
* | | | | Merge branch 'jk/oi-delta-base'Junio C Hamano2014-01-101-0/+6
|\ \ \ \ \
| * | | | | cat-file: provide %(deltabase) batch formatjk/oi-delta-baseJeff King2013-12-261-0/+6
* | | | | | Merge branch 'jk/sha1write-void'Junio C Hamano2014-01-101-2/+0
|\ \ \ \ \ \
| * | | | | | do not pretend sha1write returns errorsjk/sha1write-voidJeff King2013-12-261-2/+0
| |/ / / / /
* | | | | | Merge branch 'nd/add-empty-fix'Junio C Hamano2014-01-101-1/+1
|\ \ \ \ \ \
| * | | | | | add: don't complain when adding empty project rootnd/add-empty-fixNguyễn Thái Ngọc Duy2013-12-261-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tm/fetch-prune'Junio C Hamano2014-01-101-10/+32
|\ \ \ \ \ \
| * | | | | | fetch --prune: Run prune before fetchingtm/fetch-pruneTom Miller2014-01-031-5/+5
| * | | | | | fetch --prune: always print header urlTom Miller2014-01-031-5/+27
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mh/path-max'Junio C Hamano2014-01-102-31/+45
|\ \ \ \ \ \
| * | | | | | builtin/prune.c: use strbuf to avoid having to worry about PATH_MAXmh/path-maxJeff King2013-12-181-14/+24
| * | | | | | prune-packed: use strbuf to avoid having to worry about PATH_MAXJunio C Hamano2013-12-171-17/+21
* | | | | | | Merge branch 'cc/replace-object-info'Junio C Hamano2014-01-102-8/+61
|\ \ \ \ \ \ \
| * | | | | | | replace info: rename 'full' to 'long' and clarify in-code symbolscc/replace-object-infoChristian Couder2013-12-301-10/+14
| * | | | | | | builtin/replace: unset read_replace_refsChristian Couder2013-12-121-0/+2
| * | | | | | | builtin/replace: teach listing using short, medium or full formatsChristian Couder2013-12-121-7/+54
| * | | | | | | sha1_object_info_extended(): add an "unsigned flags" parameterChristian Couder2013-12-121-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nd/negative-pathspec'Junio C Hamano2014-01-101-1/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Support pathspec magic :(exclude) and its short form :!Nguyễn Thái Ngọc Duy2013-12-061-1/+4
* | | | | | | Merge branch 'maint'Junio C Hamano2013-12-301-2/+1
|\ \ \ \ \ \ \
| * | | | | | | for-each-ref: remove unused variableRamkumar Ramachandra2013-12-301-2/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-271-5/+53
|\ \ \ \ \ \ \
| * | | | | | | diff: avoid some nestingtg/diff-no-index-refactorThomas Gummerer2013-12-161-18/+17
| * | | | | | | diff: don't read index when --no-index is givenThomas Gummerer2013-12-121-2/+5
| * | | | | | | diff: move no-index detection to builtin/diff.cThomas Gummerer2013-12-121-3/+49
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/cat-file-regression-fix'Junio C Hamano2013-12-271-10/+20
|\ \ \ \ \ \ \
| * | | | | | | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fixJeff King2013-12-121-1/+10
| * | | | | | | cat-file: pass expand_data to print_object_or_dieJeff King2013-12-121-10/+11
| |/ / / / / /
* | | | | | | Merge branch 'jk/rev-parse-double-dashes'Junio C Hamano2013-12-271-1/+15
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: be more careful with munging argumentsjk/rev-parse-double-dashesJeff King2013-12-091-1/+5
| * | | | | | | rev-parse: correctly diagnose revision errors before "--"Jeff King2013-12-091-0/+10
| |/ / / / / /
* | | | | | | Merge branch 'jc/push-refmap'Junio C Hamano2013-12-271-22/+62
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | push: also use "upstream" mapping when pushing a single refjc/push-refmapJunio C Hamano2013-12-041-0/+11
| * | | | | | push: use remote.$name.push as a refmapJunio C Hamano2013-12-041-2/+38
| * | | | | | builtin/push.c: use strbuf instead of manual allocationJunio C Hamano2013-12-031-21/+14
| |/ / / / /
* | | | | | Sync with 1.8.5.2Junio C Hamano2013-12-171-4/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2013-12-171-10/+7
| |\ \ \ \ \
| * | | | | | cmd_repack(): remove redundant local variable "nr_packs"Michael Haggerty2013-12-171-4/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tb/clone-ssh-with-colon-for-port'Junio C Hamano2013-12-171-3/+11
|\ \ \ \ \ \
| * | | | | | git fetch-pack: add --diag-urlTorsten Bögershausen2013-12-091-3/+11